From 1adb09cacd5ec7e8f469c710fe735dde179fefa5 Mon Sep 17 00:00:00 2001 From: Marcel Konrad Date: Sat, 25 Jan 2020 14:19:00 +0100 Subject: [PATCH] Update to 1.15.2 --- build.gradle | 6 +-- .../java/exopandora/worldhandler/Main.java | 4 +- .../component/impl/ComponentDisplay.java | 2 +- .../component/impl/ComponentSummon.java | 16 +++---- .../builder/component/impl/ComponentTag.java | 14 +++--- .../builder/impl/BuilderSignEditor.java | 2 +- .../builder/impl/BuilderSummon.java | 2 +- .../worldhandler/config/Config.java | 3 +- .../gui/button/GuiButtonItem.java | 48 +++++++++---------- .../gui/button/GuiButtonList.java | 12 ++--- .../worldhandler/gui/button/GuiButtonTab.java | 22 ++++----- .../gui/button/GuiButtonTooltip.java | 2 +- .../gui/button/GuiTextFieldTooltip.java | 4 +- .../gui/container/impl/GuiWorldHandler.java | 4 +- .../gui/content/impl/ContentChangeWorld.java | 16 +++++-- .../gui/content/impl/ContentGamerules.java | 6 +-- .../gui/content/impl/ContentNoteEditor.java | 2 +- .../gui/content/impl/ContentPlayer.java | 12 ++--- .../gui/content/impl/ContentSignEditor.java | 16 +++---- src/main/resources/META-INF/mods.toml | 4 +- .../assets/worldhandler/lang/de_de.json | 2 + .../assets/worldhandler/lang/en_us.json | 2 + .../assets/worldhandler/lang/fr_fr.json | 2 + .../assets/worldhandler/lang/zh_cn.json | 2 + 24 files changed, 112 insertions(+), 93 deletions(-) diff --git a/build.gradle b/build.gradle index a528aeb..c58b074 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '1.15.1-2.8' +version = '1.15.2-2.8.1' group = 'exopandora.worldhandler' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'WorldHandler' @@ -25,7 +25,7 @@ minecraft { // stable_# Stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not always work. // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'snapshot', version: '20191225-1.14.3' + mappings channel: 'snapshot', version: '20200123-1.15.1' // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') @@ -89,7 +89,7 @@ dependencies { // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.15.1-30.0.16' + minecraft 'net.minecraftforge:forge:1.15.2-31.0.0' // You may put jars on which you depend on in ./libs or you may define them like so.. // compile "some.group:artifact:version:classifier" diff --git a/src/main/java/exopandora/worldhandler/Main.java b/src/main/java/exopandora/worldhandler/Main.java index 4ff11b0..3269f82 100644 --- a/src/main/java/exopandora/worldhandler/Main.java +++ b/src/main/java/exopandora/worldhandler/Main.java @@ -12,8 +12,8 @@ public class Main { public static final String NAME = "World Handler"; public static final String MODID = "worldhandler"; - public static final String MC_VERSION = "1.15.1"; - public static final String MOD_VERSION = "2.8"; + public static final String MC_VERSION = "1.15.2"; + public static final String MOD_VERSION = "2.8.1"; public static final String URL = "https://minecraft.curseforge.com/projects/world-handler-command-gui"; public static void main(String[] args) diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentDisplay.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentDisplay.java index e4369ad..c666ac9 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentDisplay.java +++ b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentDisplay.java @@ -32,7 +32,7 @@ public class ComponentDisplay implements IBuilderComponent { if(this.lore[x] != null && !this.lore[x].isEmpty()) { - lore.add(StringNBT.func_229705_a_(this.lore[x])); + lore.add(StringNBT.valueOf(this.lore[x])); } } diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentSummon.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentSummon.java index 4261853..2e04a26 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentSummon.java +++ b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentSummon.java @@ -68,37 +68,37 @@ public class ComponentSummon implements IBuilderComponent if(this.name.equalsIgnoreCase("Cat")) { this.tag = "CatType"; - return IntNBT.func_229692_a_(this.random.nextInt(3) + 1); + return IntNBT.valueOf(this.random.nextInt(3) + 1); } else if(this.name.equalsIgnoreCase("Farmer") || this.name.equalsIgnoreCase("Fisherman") || this.name.equalsIgnoreCase("Shepherd") || this.name.equalsIgnoreCase("Fletcher")) { this.tag = "Profession"; - return IntNBT.func_229692_a_(0); + return IntNBT.valueOf(0); } else if(this.name.equalsIgnoreCase("Librarian") || this.name.equalsIgnoreCase("Carthographer")) { this.tag = "Profession"; - return IntNBT.func_229692_a_(1); + return IntNBT.valueOf(1); } else if(this.name.equalsIgnoreCase("Cleric") || this.name.equalsIgnoreCase("Priest")) { this.tag = "Profession"; - return IntNBT.func_229692_a_(2); + return IntNBT.valueOf(2); } else if(this.name.equalsIgnoreCase("Armorer") || this.name.equalsIgnoreCase("Blacksmith") || this.name.equalsIgnoreCase("WeaponSmith") || this.name.equalsIgnoreCase("ToolSmith")) { this.tag = "Profession"; - return IntNBT.func_229692_a_(3); + return IntNBT.valueOf(3); } else if(this.name.equalsIgnoreCase("Butcher") || this.name.equalsIgnoreCase("Leatherworker")) { this.tag = "Profession"; - return IntNBT.func_229692_a_(4); + return IntNBT.valueOf(4); } else if(this.name.equalsIgnoreCase("Nitwit")) { this.tag = "Profession"; - return IntNBT.func_229692_a_(5); + return IntNBT.valueOf(5); } if(this.entity != null) @@ -108,7 +108,7 @@ public class ComponentSummon implements IBuilderComponent if(StringUtils.containsIgnoreCase(this.name, "Baby")) { this.tag = "IsBaby"; - return ByteNBT.func_229671_a_((byte) 1); + return ByteNBT.valueOf((byte) 1); } } else if(this.entity.equals(EntityType.CHICKEN.getRegistryName())) diff --git a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentTag.java b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentTag.java index 1a99c55..7e6d956 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentTag.java +++ b/src/main/java/exopandora/worldhandler/builder/component/impl/ComponentTag.java @@ -80,7 +80,7 @@ public class ComponentTag implements IBuilderComponent return null; } - return StringNBT.func_229705_a_(string); + return StringNBT.valueOf(string); } else if(this.value instanceof INBT) { @@ -98,27 +98,27 @@ public class ComponentTag implements IBuilderComponent } else if(this.value instanceof Integer) { - return IntNBT.func_229692_a_((Integer) this.value); + return IntNBT.valueOf((Integer) this.value); } else if(this.value instanceof Byte) { - return ByteNBT.func_229671_a_((Byte) this.value); + return ByteNBT.valueOf((Byte) this.value); } else if(this.value instanceof Float) { - return FloatNBT.func_229689_a_((Float) this.value); + return FloatNBT.valueOf((Float) this.value); } else if(this.value instanceof Double) { - return DoubleNBT.func_229684_a_((Double) this.value); + return DoubleNBT.valueOf((Double) this.value); } else if(this.value instanceof Long) { - return LongNBT.func_229698_a_((Long) this.value); + return LongNBT.valueOf((Long) this.value); } else if(this.value instanceof Short) { - return ShortNBT.func_229701_a_((Short) this.value); + return ShortNBT.valueOf((Short) this.value); } else if(this.value instanceof Byte[]) { diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSignEditor.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSignEditor.java index 216f537..56cd8e7 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSignEditor.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSignEditor.java @@ -23,7 +23,7 @@ public class BuilderSignEditor extends BuilderData for(int x = 0; x < 4; x++) { - this.sign[x] = this.registerNBTComponent(new ComponentTag("Text" + (x + 1), new SignText(x), text -> StringNBT.func_229705_a_(text.toString()))); + this.sign[x] = this.registerNBTComponent(new ComponentTag("Text" + (x + 1), new SignText(x), text -> StringNBT.valueOf(text.toString()))); } } diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSummon.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSummon.java index 5c5dfc0..1b5b9f5 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSummon.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSummon.java @@ -349,7 +349,7 @@ public class BuilderSummon extends CommandBuilderNBT { if(string.getUnformattedComponentText() != null && !string.getUnformattedComponentText().isEmpty()) { - return StringNBT.func_229705_a_(string.serialize()); + return StringNBT.valueOf(string.serialize()); } return null; diff --git a/src/main/java/exopandora/worldhandler/config/Config.java b/src/main/java/exopandora/worldhandler/config/Config.java index 9410e1d..168d148 100644 --- a/src/main/java/exopandora/worldhandler/config/Config.java +++ b/src/main/java/exopandora/worldhandler/config/Config.java @@ -15,6 +15,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.config.ModConfig.Reloading; import net.minecraftforge.fml.config.ModConfig.Type; public class Config @@ -108,7 +109,7 @@ public class Config } @SubscribeEvent - public static void configReload(ModConfig.ConfigReloading event) + public static void configReload(Reloading event) { if(event.getConfig().getType().equals(Type.CLIENT) && Config.CONFIG_DATA != null) { diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonItem.java b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonItem.java index eb06b64..ffb26fa 100644 --- a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonItem.java +++ b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonItem.java @@ -13,31 +13,31 @@ import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) public class GuiButtonItem extends GuiButtonBase { - private final ItemStack stack; + private final ItemStack stack; - public GuiButtonItem(int x, int y, int width, int height, Item item, ActionHandler actionHandler) - { - this(x, y, width, height, new ItemStack(item), actionHandler); - } - - public GuiButtonItem(int x, int y, int width, int height, ItemStack stack, ActionHandler actionHandler) - { - super(x, y, width, height, stack.getTextComponent().getString(), actionHandler); - this.stack = stack; - } - - @Override - public void renderButton(int mouseX, int mouseY, float partialTicks) - { - super.renderBg(Minecraft.getInstance(), mouseX, mouseY); - - RenderSystem.enableRescaleNormal(); - RenderHelper.func_227784_d_(); - + public GuiButtonItem(int x, int y, int width, int height, Item item, ActionHandler actionHandler) + { + this(x, y, width, height, new ItemStack(item), actionHandler); + } + + public GuiButtonItem(int x, int y, int width, int height, ItemStack stack, ActionHandler actionHandler) + { + super(x, y, width, height, stack.getTextComponent().getString(), actionHandler); + this.stack = stack; + } + + @Override + public void renderButton(int mouseX, int mouseY, float partialTicks) + { + super.renderBg(Minecraft.getInstance(), mouseX, mouseY); + + RenderSystem.enableRescaleNormal(); + RenderHelper.enableStandardItemLighting(); + Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(this.stack, this.x + this.width / 2 - 8, this.y + 2); - + RenderHelper.disableStandardItemLighting(); - RenderSystem.disableRescaleNormal(); - RenderSystem.enableAlphaTest(); - } + RenderSystem.disableRescaleNormal(); + RenderSystem.enableAlphaTest(); + } } diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonList.java b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonList.java index 4c11c7d..bc04487 100644 --- a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonList.java +++ b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonList.java @@ -46,12 +46,12 @@ public class GuiButtonList extends GuiButtonTooltip String leftArrow = this.isHoveringLeft(mouseX, mouseY) ? TextFormatting.BOLD + "<" + TextFormatting.RESET : "<"; String rightArrow = this.isHoveringRight(mouseX, mouseY) ? TextFormatting.BOLD + ">" + TextFormatting.RESET : ">"; - int maxWidth = Math.max(0, this.width - fontRenderer.getStringWidth("< >")); - int spaceWidth = fontRenderer.getStringWidth(" "); - - String display = exopandora.worldhandler.util.TextFormatting.shortenString(this.getMessage(), maxWidth, fontRenderer); - int yPos = this.y + (this.height - 8) / 2; - + int maxWidth = Math.max(0, this.width - fontRenderer.getStringWidth("< >")); + int spaceWidth = fontRenderer.getStringWidth(" "); + + String display = exopandora.worldhandler.util.TextFormatting.shortenString(this.getMessage(), maxWidth, fontRenderer); + int yPos = this.y + (this.height - 8) / 2; + this.drawCenteredString(fontRenderer, display, this.x + this.width / 2, yPos, this.getFGColor()); this.drawCenteredString(fontRenderer, leftArrow, this.x + this.width / 2 - maxWidth / 2 - spaceWidth, yPos, this.getFGColor()); this.drawCenteredString(fontRenderer, rightArrow, this.x + this.width / 2 + maxWidth / 2 + spaceWidth, yPos, this.getFGColor()); diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTab.java b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTab.java index c616ca8..0973802 100644 --- a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTab.java +++ b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTab.java @@ -13,15 +13,15 @@ public abstract class GuiButtonTab extends AbstractButton super(x, y, widthIn, heightIn, narration); } - @Override - public void render(int mouseX, int mouseY, float partialTicks) - { - - } - - @Override - public void playDownSound(SoundHandler soundHandlerIn) - { - - } + @Override + public void render(int mouseX, int mouseY, float partialTicks) + { + + } + + @Override + public void playDownSound(SoundHandler soundHandlerIn) + { + + } } diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTooltip.java b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTooltip.java index 8084b12..04ff61d 100644 --- a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTooltip.java +++ b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTooltip.java @@ -7,7 +7,7 @@ import exopandora.worldhandler.util.ActionHandler; import net.minecraft.client.Minecraft; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.client.config.GuiUtils; +import net.minecraftforge.fml.client.gui.GuiUtils; @OnlyIn(Dist.CLIENT) public class GuiButtonTooltip extends GuiButtonBase diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiTextFieldTooltip.java b/src/main/java/exopandora/worldhandler/gui/button/GuiTextFieldTooltip.java index 30539f4..eeaf89e 100644 --- a/src/main/java/exopandora/worldhandler/gui/button/GuiTextFieldTooltip.java +++ b/src/main/java/exopandora/worldhandler/gui/button/GuiTextFieldTooltip.java @@ -31,8 +31,8 @@ public class GuiTextFieldTooltip extends TextFieldWidget if(this.getVisible() && !this.isFocused() && this.tooltip != null && TextFormatting.getTextWithoutFormattingCodes(this.getText()).isEmpty()) { boolean enableBackgroundDrawing = this.getAdjustedWidth() != this.width; - int tx = enableBackgroundDrawing ? this.x + 4 : this.x; - int ty = enableBackgroundDrawing ? this.y + (this.height - 8) / 2 : this.y; + int tx = enableBackgroundDrawing ? this.x + 4 : this.x; + int ty = enableBackgroundDrawing ? this.y + (this.height - 8) / 2 : this.y; Minecraft.getInstance().fontRenderer.drawStringWithShadow(this.tooltip, (float) tx, (float) ty, 0x7F7F7F); } diff --git a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java index be03f06..79ec78f 100644 --- a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java +++ b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java @@ -36,7 +36,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.StringTextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.client.config.GuiUtils; +import net.minecraftforge.fml.client.gui.GuiUtils; @OnlyIn(Dist.CLIENT) public class GuiWorldHandler extends Container @@ -380,7 +380,7 @@ public class GuiWorldHandler extends Container if(this.splash != null) { RenderSystem.pushMatrix(); - RenderHelper.func_227784_d_(); + RenderHelper.enableStandardItemLighting(); RenderSystem.disableLighting(); RenderSystem.translatef((float) (backgroundX + 212), backgroundY + 15, 0.0F); RenderSystem.rotatef(17.0F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java index 4eac253..4ad566a 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentChangeWorld.java @@ -13,6 +13,7 @@ import net.minecraft.client.gui.screen.ConnectingScreen; import net.minecraft.client.gui.screen.DirtMessageScreen; import net.minecraft.client.gui.screen.MainMenuScreen; import net.minecraft.client.gui.screen.MultiplayerScreen; +import net.minecraft.client.gui.screen.MultiplayerWarningScreen; import net.minecraft.client.gui.screen.WorldSelectionScreen; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.resources.I18n; @@ -39,7 +40,16 @@ public class ContentChangeWorld extends ContentChild container.add(new GuiButtonBase(x + 116 / 2, y + 48, 232 / 2, 20, I18n.format("gui.worldhandler.change_world.multiplayer"), () -> { Connection connection = ContentChangeWorld.disconnect(); - Minecraft.getInstance().displayGuiScreen(new MultiplayerScreen(new DummyScreen(() -> ContentChangeWorld.reconnect(connection)))); + DummyScreen dummy = new DummyScreen(() -> ContentChangeWorld.reconnect(connection)); + + if(Minecraft.getInstance().gameSettings.field_230152_Z_) + { + Minecraft.getInstance().displayGuiScreen(new MultiplayerScreen(dummy)); + } + else + { + Minecraft.getInstance().displayGuiScreen(new MultiplayerWarningScreen(dummy)); + } })); } @@ -55,13 +65,13 @@ public class ContentChangeWorld extends ContentChild String folderName = Minecraft.getInstance().getIntegratedServer().getFolderName(); Minecraft.getInstance().world.sendQuittingDisconnectingPacket(); - Minecraft.getInstance().func_213231_b(new DirtMessageScreen(new TranslationTextComponent("menu.savingLevel"))); + Minecraft.getInstance().unloadWorld(new DirtMessageScreen(new TranslationTextComponent("menu.savingLevel"))); return new IntegratedConnection(Type.INTEGRATED, worldName, folderName); } Minecraft.getInstance().world.sendQuittingDisconnectingPacket(); - Minecraft.getInstance().func_213254_o(); + Minecraft.getInstance().unloadWorld(); if(isRealms) { diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java index c8fbe78..945fb36 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java @@ -63,12 +63,12 @@ public class ContentGamerules extends Content Map> map = new HashMap>(); - GameRules.func_223590_a(new IRuleEntryVisitor() + GameRules.visitAll(new IRuleEntryVisitor() { @Override - public > void func_223481_a(RuleKey rule, RuleType type) + public > void visit(RuleKey rule, RuleType type) { - map.put(rule.func_223576_a(), type.func_223581_a(null).getType()); + map.put(rule.getName(), type.createArgument(null).getType()); } }); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java index 2b87775..86e2ee4 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentNoteEditor.java @@ -196,7 +196,7 @@ public class ContentNoteEditor extends Content RenderSystem.color3f(1.0F, 1.0F, 1.0F); RenderSystem.pushMatrix(); - RenderHelper.func_227784_d_(); + RenderHelper.enableStandardItemLighting(); RenderSystem.translatef(container.width / 2 - 8 * scale, container.height / 2 - 15 - 8 * scale, 0); RenderSystem.scalef(scale, scale, scale); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java index c1ab93e..fd7c300 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPlayer.java @@ -115,9 +115,9 @@ public class ContentPlayer extends Content container.add(new GuiButtonBase(x + 118, y + 72, 114, 20, I18n.format("gui.worldhandler.entities.player.position.copy_position"), () -> { - int posX = MathHelper.floor(Minecraft.getInstance().player.func_226277_ct_()); - int posY = MathHelper.floor(Minecraft.getInstance().player.func_226278_cu_()); - int posZ = MathHelper.floor(Minecraft.getInstance().player.func_226281_cx_()); + int posX = MathHelper.floor(Minecraft.getInstance().player.getPosX()); + int posY = MathHelper.floor(Minecraft.getInstance().player.getPosY()); + int posZ = MathHelper.floor(Minecraft.getInstance().player.getPosZ()); Minecraft.getInstance().keyboardListener.setClipboardString(posX + " " + posY + " " + posZ); })); @@ -148,9 +148,9 @@ public class ContentPlayer extends Content @Override public void tick(Container container) { - this.posXField.setText("X: " + MathHelper.floor(Minecraft.getInstance().player.func_226277_ct_())); - this.posYField.setText("Y: " + MathHelper.floor(Minecraft.getInstance().player.func_226278_cu_())); - this.posZField.setText("Z: " + MathHelper.floor(Minecraft.getInstance().player.func_226281_cx_())); + this.posXField.setText("X: " + MathHelper.floor(Minecraft.getInstance().player.getPosX())); + this.posYField.setText("Y: " + MathHelper.floor(Minecraft.getInstance().player.getPosY())); + this.posZField.setText("Z: " + MathHelper.floor(Minecraft.getInstance().player.getPosZ())); this.scoreField.setText(I18n.format("gui.worldhandler.entities.player.score") + ": " + Minecraft.getInstance().player.getScore()); this.coinsField.setText(I18n.format("gui.worldhandler.entities.player.score.experience") + ": " + Minecraft.getInstance().player.experienceLevel + "L"); this.xpField.setText(I18n.format("gui.worldhandler.entities.player.score.experience_coins") + ": " + Minecraft.getInstance().player.experienceTotal); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java index f598848..d92e50b 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java @@ -177,17 +177,17 @@ public class ContentSignEditor extends Content } else { - float scale = 4; + float scale = 4; RenderSystem.color3f(1.0F, 1.0F, 1.0F); RenderSystem.pushMatrix(); - RenderHelper.func_227784_d_(); - - RenderSystem.translatef(container.width / 2 - 8.5F * scale, container.height / 2 - 15 - 8.5F * scale, 0); - RenderSystem.scalef(scale, scale, scale); - Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(new ItemStack(Items.OAK_SIGN), 0, 0); - - RenderHelper.disableStandardItemLighting(); + RenderHelper.enableStandardItemLighting(); + + RenderSystem.translatef(container.width / 2 - 8.5F * scale, container.height / 2 - 15 - 8.5F * scale, 0); + RenderSystem.scalef(scale, scale, scale); + Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(new ItemStack(Items.OAK_SIGN), 0, 0); + + RenderHelper.disableStandardItemLighting(); RenderSystem.popMatrix(); String displayString = I18n.format("gui.worldhandler.blocks.sign_editor.look_at_sign", KeyHandler.KEY_WORLD_HANDLER.getLocalizedName()); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index b4152ad..7c602be 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[29,)" +loaderVersion="[30,)" updateJSONURL="https://raw.githubusercontent.com/Exopandora/worldhandler/master/version.json" issueTrackerURL="https://github.com/Exopandora/WorldHandler/issues" displayURL="https://minecraft.curseforge.com/projects/world-handler-command-gui" @@ -10,7 +10,7 @@ logoBlur=false [[mods]] modId="worldhandler" -version="1.15.1-2.8" +version="1.15.2-2.8.1" displayName="World Handler" description=''' The World Handler provides a simple and easy to use graphical user interface for commands. It lets you create powerful and complex sub-commands alongside NBT-structures within seconds. diff --git a/src/main/resources/assets/worldhandler/lang/de_de.json b/src/main/resources/assets/worldhandler/lang/de_de.json index 9bcc8f9..1b57ed0 100644 --- a/src/main/resources/assets/worldhandler/lang/de_de.json +++ b/src/main/resources/assets/worldhandler/lang/de_de.json @@ -228,6 +228,8 @@ "gui.worldhandler.gamerules.rule.drowningDamage": "Ertrinkungsschaden", "gui.worldhandler.gamerules.rule.fallDamage": "Fallschaden", "gui.worldhandler.gamerules.rule.fireDamage": "Feuerschaden", + "gui.worldhandler.gamerules.rule.doPatrolSpawning": "Patrouillen", + "gui.worldhandler.gamerules.rule.doTraderSpawning": "Wandernder Händler", "gui.worldhandler.world_info.start": "Start", "gui.worldhandler.world_info.world": "Welt", diff --git a/src/main/resources/assets/worldhandler/lang/en_us.json b/src/main/resources/assets/worldhandler/lang/en_us.json index 3d6ff7b..50f3dd0 100644 --- a/src/main/resources/assets/worldhandler/lang/en_us.json +++ b/src/main/resources/assets/worldhandler/lang/en_us.json @@ -227,6 +227,8 @@ "gui.worldhandler.gamerules.rule.drowningDamage": "Drowning Damage", "gui.worldhandler.gamerules.rule.fallDamage": "Fall Damage", "gui.worldhandler.gamerules.rule.fireDamage": "Fire Damage", + "gui.worldhandler.gamerules.rule.doPatrolSpawning": "Patrol Spawning", + "gui.worldhandler.gamerules.rule.doTraderSpawning": "Trader Spawning", "gui.worldhandler.world_info.start": "Start", "gui.worldhandler.world_info.world": "World", diff --git a/src/main/resources/assets/worldhandler/lang/fr_fr.json b/src/main/resources/assets/worldhandler/lang/fr_fr.json index b1e7aca..daa6fb2 100644 --- a/src/main/resources/assets/worldhandler/lang/fr_fr.json +++ b/src/main/resources/assets/worldhandler/lang/fr_fr.json @@ -227,6 +227,8 @@ "gui.worldhandler.gamerules.rule.drowningDamage": "Dégâts de noyade", "gui.worldhandler.gamerules.rule.fallDamage": "Dégâts de chute", "gui.worldhandler.gamerules.rule.fireDamage": "Dégâts de feu", + "gui.worldhandler.gamerules.rule.doPatrolSpawning": "Patrol Spawning", + "gui.worldhandler.gamerules.rule.doTraderSpawning": "Trader Spawning", "gui.worldhandler.world_info.start": "Démarrer", "gui.worldhandler.world_info.world": "Monde", diff --git a/src/main/resources/assets/worldhandler/lang/zh_cn.json b/src/main/resources/assets/worldhandler/lang/zh_cn.json index 237fee6..56d4432 100644 --- a/src/main/resources/assets/worldhandler/lang/zh_cn.json +++ b/src/main/resources/assets/worldhandler/lang/zh_cn.json @@ -228,6 +228,8 @@ "gui.worldhandler.gamerules.rule.drowningDamage": "Drowning Damage", "gui.worldhandler.gamerules.rule.fallDamage": "Fall Damage", "gui.worldhandler.gamerules.rule.fireDamage": "Fire Damage", + "gui.worldhandler.gamerules.rule.doPatrolSpawning": "Patrol Spawning", + "gui.worldhandler.gamerules.rule.doTraderSpawning": "Trader Spawning", "gui.worldhandler.world_info.start": "首选项", "gui.worldhandler.world_info.world": "世界",