mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #423 from StrangeOne101/master

Browse Source 
Tweaks
This commit is contained in:
StrangeOne101 2021-07-17 17:29:20 +12:00 committed by GitHub
commit 4cd3f9bd38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -34,6 +34,7 @@ registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/s
registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins');
registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins');
registerCustomOutputTask('Coco', 'C:/Users/sjoer/Documents/MCServer/plugins');
registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins');
// ==============================================================
def registerCustomOutputTask(name, path) {

3
src/main/java/com/volmit/iris/core/ProjectManager.java
View File

@ -301,7 +301,8 @@ public class ProjectManager {
KMap<String, String> l = new KMap<>();
for (String i : a.keySet()) {
l.put(i, a.getString(i));
if (a.get(i) instanceof String)
l.put(i, a.getString(i));
}
return l;

1
src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java
View File

@ -49,6 +49,7 @@ public class CommandIrisStudioOpen extends MortarCommand {
return true;
}
sender.sendMessage("Opening studio world...");
Iris.proj.open(sender, args[0]);
return true;
}

7
src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java
View File

@ -52,7 +52,12 @@ public class CommandIrisCreate extends MortarCommand {
@Override
public void addTabOptions(VolmitSender sender, String[] args, KList<String> list) {
if (args.length == 0 || args[args.length - 1].equals("")) { //They are about to type a new argument
if (args.length == 0) {
list.add("[worldname]");
return;
}
if (args.length >= 1 || args[args.length - 1].equals("")) { //They are about to type a new argument
list.addAll(getBase(args));
return;
}

27
src/main/java/com/volmit/iris/core/gui/IrisVision.java
View File

@ -75,7 +75,7 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene
private int lowq = 12;
private int posZ = 0;
private double scale = 128;
private double mscale = 1D;
private double mscale = 4D;
private int w = 0;
private int h = 0;
private double lx = 0;
@ -358,7 +358,8 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene
}
private double getWorldX(double screenX) {
return (mscale * screenX) + ((oxp / scale) * mscale);
//return (mscale * screenX) + ((oxp / scale) * mscale);
return (mscale * screenX) + ((oxp / scale));
}
private double getWorldZ(double screenZ) {
@ -602,8 +603,8 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene
KList<String> l = new KList<>();
l.add("Biome: " + biome.getName());
l.add("Region: " + region.getName() + "(" + region.getLoadKey() + ")");
l.add("Block " + (int) getWorldX(hx) + ", " + (int) getWorldZ(hz));
if (detailed) {
l.add("Block " + (int) getWorldX(hx) + ", " + (int) getWorldZ(hz));
l.add("Chunk " + ((int) getWorldX(hx) >> 4) + ", " + ((int) getWorldZ(hz) >> 4));
l.add("Region " + (((int) getWorldX(hx) >> 4) >> 5) + ", " + (((int) getWorldZ(hz) >> 4) >> 5));
l.add("Key: " + biome.getLoadKey());
@ -676,9 +677,11 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene
private void teleport() {
J.s(() -> {
if (player != null) {
double h = engine.getFramework().getComplex().getTrueHeightStream().get(getWorldX(hx), getWorldZ(hz));
player.teleport(new Location(player.getWorld(), getWorldX(hx), h, getWorldZ(hz)));
notify("Teleporting to " + Form.f((int) getWorldX(hx)) + ", " + Form.f((int) h) + ", " + Form.f((int) getWorldZ(hz)));
int xx = (int) getWorldX(hx);
int zz = (int) getWorldZ(hz);
double h = engine.getFramework().getComplex().getTrueHeightStream().get(xx, zz);
player.teleport(new Location(player.getWorld(), xx, h, zz));
notify("Teleporting to " + xx + ", " + (int) h + ", " + zz);
} else {
notify("No player in world, can't teleport.");
}
@ -704,17 +707,17 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene
}
w += 28;
h += 28;
h += 14;
int cw = (int) ((w + 26) * pushX);
int ch = (int) ((h + 26) * pushZ);
g.setColor(Color.darkGray);
g.fillRect((int) x + 7 + 2 - cw, (int) y + 7 + 2 - ch, w + 7, h + 7); // Shadow
g.fillRect((int) x + 7 + 2 - cw, (int) y + 12 + 2 - ch, w + 7, h); // Shadow
g.setColor(Color.gray);
g.fillRect((int) x + 7 + 1 - cw, (int) y + 7 + 1 - ch, w + 7, h + 7); // Shadow
g.fillRect((int) x + 7 + 1 - cw, (int) y + 12 + 1 - ch, w + 7, h); // Shadow
g.setColor(Color.white);
g.fillRect((int) x + 7 - cw, (int) y + 7 - ch, w + 7, h + 7);
g.fillRect((int) x + 7 - cw, (int) y + 12 - ch, w + 7, h);
g.setColor(Color.black);
int m = 0;
@ -756,10 +759,10 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene
return;
}
Iris.info("Blocks/Pixel: " + (mscale) + ", Blocks Wide: " + (w * mscale));
//Iris.info("Blocks/Pixel: " + (mscale) + ", Blocks Wide: " + (w * mscale));
positions.clear();
fastpositions.clear();
mscale = mscale + ((0.044 * mscale) * notches);
mscale = mscale + ((0.25 * mscale) * notches);
mscale = Math.max(mscale, 0.00001);
}