diff --git a/.gitignore b/.gitignore index 06f87cea6..69953a0e9 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ java_pid2412.hprof /logs/ /classes/ /gradle.properties +/buildSrc/.gradle/ +/buildSrc/build/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index ebf318ed3..500a6a0e9 100644 --- a/build.gradle +++ b/build.gradle @@ -196,10 +196,10 @@ task renameCrowdin(type: Copy, dependsOn: ['crowdin', 'cleanCrowdin']){ } } -import techreborn.build.GenerateResourcesTask -task genResources(type: GenerateResourcesTask){ - outputDir = file("src/main/resources") -} +//import techreborn.build.GenerateResourcesTask +//task genResources(type: GenerateResourcesTask){ +// outputDir = file("src/main/resources") +//} publishing { publications { diff --git a/src/main/java/techreborn/client/EGui.java b/src/main/java/techreborn/client/EGui.java index 1dab0d37f..41b4ccfa7 100644 --- a/src/main/java/techreborn/client/EGui.java +++ b/src/main/java/techreborn/client/EGui.java @@ -224,7 +224,7 @@ public enum EGui implements IMachineGuiHandler { public static EGui byID(ResourceLocation resourceLocation){ return Arrays.stream(values()) - .filter(eGui -> eGui.name().toLowerCase().equals(resourceLocation.toString())) + .filter(eGui -> eGui.name().toLowerCase().equals(resourceLocation.getPath())) .findFirst() .orElseThrow(() -> new RuntimeException("Failed to find gui for " + resourceLocation)); } @@ -245,12 +245,12 @@ public enum EGui implements IMachineGuiHandler { @Override public String getGuiID() { - return gui.name().toLowerCase(); + return "techreborn:" + gui.name().toLowerCase(); } @Override public ITextComponent getName() { - return new TextComponentString(gui.name().toLowerCase()); + return new TextComponentString(getGuiID()); } @Override @@ -263,13 +263,7 @@ public enum EGui implements IMachineGuiHandler { public ITextComponent getCustomName() { return null; } - }, new Consumer() { - @Override - public void accept(PacketBuffer packetBuffer) { - packetBuffer.writeBlockPos(pos); - } - }); - //player.openGui(TechReborn.INSTANCE, this.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); + }, packetBuffer -> packetBuffer.writeBlockPos(pos)); } }