diff --git a/build.gradle b/build.gradle index 38bfeec..eeddeea 100644 --- a/build.gradle +++ b/build.gradle @@ -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: '20190719-1.14.3' + mappings channel: 'snapshot', version: '20191019-1.14.3' // 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.14.4-28.1.1' + minecraft 'net.minecraftforge:forge:1.14.4-28.1.61' // 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/gui/container/impl/GuiWorldHandler.java b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java index e6aee8e..1ff472d 100644 --- a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java +++ b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java @@ -131,7 +131,7 @@ public class GuiWorldHandler extends Container this.nameField = new GuiTextFieldTooltip(0, 0, 0, 11); this.nameField.setMaxStringLength(16); this.nameField.setText(this.getPlayer()); - this.nameField.func_212954_a(text -> + this.nameField.setResponder(text -> { WorldHandler.USERNAME = text; this.updateNameField(); diff --git a/src/main/java/exopandora/worldhandler/gui/content/element/impl/ElementColorMenu.java b/src/main/java/exopandora/worldhandler/gui/content/element/impl/ElementColorMenu.java index 0c57126..ac387ba 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/element/impl/ElementColorMenu.java +++ b/src/main/java/exopandora/worldhandler/gui/content/element/impl/ElementColorMenu.java @@ -67,7 +67,7 @@ public class ElementColorMenu extends Element this.textField.setValidator(this.logic::validate); this.textField.setTextFormatter(this.string::formatter); this.textField.setText(this.string.getText()); - this.textField.func_212954_a(text -> + this.textField.setResponder(text -> { this.string.setText(text); }); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java index b241275..85f315b 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcher.java @@ -56,7 +56,7 @@ public class ContentButcher extends ContentChild return true; }); this.radiusField.setText(this.radius); - this.radiusField.func_212954_a(text -> + this.radiusField.setResponder(text -> { this.radius = text; diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java index 4579532..1afb082 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java @@ -87,7 +87,7 @@ public class ContentCustomItem extends Content this.itemField = new GuiTextFieldTooltip(x + 118, y, 114, 20, I18n.format("gui.worldhandler.items.custom_item.start.item_id")); this.itemField.setValidator(Predicates.notNull()); this.itemField.setText(this.item); - this.itemField.func_212954_a(text -> + this.itemField.setResponder(text -> { this.item = text; this.builderCutomItem.setItem(this.item); @@ -97,7 +97,7 @@ public class ContentCustomItem extends Content this.itemLore1Field = new GuiTextFieldTooltip(x + 118, y + 24, 114, 20, I18n.format("gui.worldhandler.items.custom_item.start.lore_1")); this.itemLore1Field.setValidator(Predicates.notNull()); this.itemLore1Field.setText(this.builderCutomItem.getLore1()); - this.itemLore1Field.func_212954_a(text -> + this.itemLore1Field.setResponder(text -> { this.builderCutomItem.setLore1(text); container.initButtons(); @@ -106,7 +106,7 @@ public class ContentCustomItem extends Content this.itemLore2Field = new GuiTextFieldTooltip(x + 118, y + 48, 114, 20, I18n.format("gui.worldhandler.items.custom_item.start.lore_2")); this.itemLore2Field.setValidator(Predicates.notNull()); this.itemLore2Field.setText(this.builderCutomItem.getLore2()); - this.itemLore2Field.func_212954_a(text -> + this.itemLore2Field.setResponder(text -> { this.builderCutomItem.setLore2(text); container.initButtons(); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java index d6090c2..8700f0c 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEditBlocks.java @@ -81,7 +81,7 @@ public class ContentEditBlocks extends Content this.x1Field = new GuiTextFieldTooltip(x + 118, y, 55, 20); this.x1Field.setValidator(this.getCoordinatePredicate("X1")); this.x1Field.setText("X1: " + BlockHelper.getPos1().getX()); - this.x1Field.func_212954_a(text -> + this.x1Field.setResponder(text -> { BlockHelper.setPos1(BlockHelper.setX(BlockHelper.getPos1(), this.parseCoordinate(text))); }); @@ -89,7 +89,7 @@ public class ContentEditBlocks extends Content this.y1Field = new GuiTextFieldTooltip(x + 118, y + 24, 55, 20); this.y1Field.setValidator(this.getCoordinatePredicate("Y1")); this.y1Field.setText("Y1: " + BlockHelper.getPos1().getY()); - this.y1Field.func_212954_a(text -> + this.y1Field.setResponder(text -> { BlockHelper.setPos1(BlockHelper.setY(BlockHelper.getPos1(), this.parseCoordinate(text))); }); @@ -97,7 +97,7 @@ public class ContentEditBlocks extends Content this.z1Field = new GuiTextFieldTooltip(x + 118, y + 48, 55, 20); this.z1Field.setValidator(this.getCoordinatePredicate("Z1")); this.z1Field.setText("Z1: " + BlockHelper.getPos1().getZ()); - this.z1Field.func_212954_a(text -> + this.z1Field.setResponder(text -> { BlockHelper.setPos1(BlockHelper.setZ(BlockHelper.getPos1(), this.parseCoordinate(text))); }); @@ -105,7 +105,7 @@ public class ContentEditBlocks extends Content this.x2Field = new GuiTextFieldTooltip(x + 118 + 59, y, 55, 20); this.x2Field.setValidator(this.getCoordinatePredicate("X2")); this.x2Field.setText("X2: " + BlockHelper.getPos2().getX()); - this.x2Field.func_212954_a(text -> + this.x2Field.setResponder(text -> { BlockHelper.setPos2(BlockHelper.setX(BlockHelper.getPos2(), this.parseCoordinate(text))); }); @@ -113,7 +113,7 @@ public class ContentEditBlocks extends Content this.y2Field = new GuiTextFieldTooltip(x + 118 + 59, y + 24, 55, 20); this.y2Field.setValidator(this.getCoordinatePredicate("Y2")); this.y2Field.setText("Y2: " + BlockHelper.getPos2().getY()); - this.y2Field.func_212954_a(text -> + this.y2Field.setResponder(text -> { BlockHelper.setPos2(BlockHelper.setY(BlockHelper.getPos2(), this.parseCoordinate(text))); }); @@ -121,7 +121,7 @@ public class ContentEditBlocks extends Content this.z2Field = new GuiTextFieldTooltip(x + 118 + 59, y + 48, 55, 20); this.z2Field.setValidator(this.getCoordinatePredicate("Z2")); this.z2Field.setText("Z2: " + BlockHelper.getPos2().getZ()); - this.z2Field.func_212954_a(text -> + this.z2Field.setResponder(text -> { BlockHelper.setPos2(BlockHelper.setZ(BlockHelper.getPos2(), this.parseCoordinate(text))); }); @@ -129,7 +129,7 @@ public class ContentEditBlocks extends Content this.block1Field = new GuiTextFieldTooltip(x + 118, y, 114, 20, this.selectedPage.equals("fill") ? I18n.format("gui.worldhandler.edit_blocks.fill.block_id_to_fill") : I18n.format("gui.worldhandler.edit_blocks.replace.block_id_replace")); this.block1Field.setValidator(Predicates.notNull()); this.block1Field.setText(this.block1); - this.block1Field.func_212954_a(text -> + this.block1Field.setResponder(text -> { this.block1 = text; this.builderFill.setBlock1(this.block1); @@ -139,7 +139,7 @@ public class ContentEditBlocks extends Content this.block2Field = new GuiTextFieldTooltip(x + 118, y + 24, 114, 20, I18n.format("gui.worldhandler.edit_blocks.replace.block_id_place")); this.block2Field.setValidator(Predicates.notNull()); this.block2Field.setText(this.block2); - this.block2Field.func_212954_a(text -> + this.block2Field.setResponder(text -> { this.block2 = text; this.builderFill.setBlock2(this.block2); @@ -149,7 +149,7 @@ public class ContentEditBlocks extends Content this.filterField = new GuiTextFieldTooltip(x + 118, y + 24, 114, 20, I18n.format("gui.worldhandler.edit_blocks.clone.filter")); this.filterField.setValidator(Predicates.notNull()); this.filterField.setText(this.filter); - this.filterField.func_212954_a(text -> + this.filterField.setResponder(text -> { this.filter = text; this.builderClone.setFilter(this.filter); 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 2204ab5..42b2d6f 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java @@ -55,7 +55,7 @@ public class ContentGamerules extends Content this.valueField.setValidator(Predicates.notNull()); this.valueField.setText(this.value); this.valueField.setCursorPositionEnd(); - this.valueField.func_212954_a(text -> + this.valueField.setResponder(text -> { this.value = text; this.builderGamerule.setValue(this.value); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java index b18db2d..4c38164 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentMultiplayer.java @@ -88,7 +88,7 @@ public class ContentMultiplayer extends Content this.playerField.setFocused2(false); this.playerField.setText(this.builderKick.getPlayer()); this.playerField.setMaxStringLength(16); - this.playerField.func_212954_a(text -> + this.playerField.setResponder(text -> { this.setPlayer(this.playerField.getText()); container.initButtons(); @@ -98,7 +98,7 @@ public class ContentMultiplayer extends Content this.reasonField.setValidator(Predicates.notNull()); this.reasonField.setFocused2(false); this.reasonField.setText(this.builderKick.getReason()); - this.reasonField.func_212954_a(text -> + this.reasonField.setResponder(text -> { this.setReason(this.reasonField.getText()); container.initButtons(); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java index a0144fa..0216540 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java @@ -51,7 +51,7 @@ public class ContentScoreboardObjectives extends ContentScoreboard this.objectField = new GuiTextFieldTooltip(x + 118, y + (this.selectedObjective.equals("remove") ? 24 : 0), 114, 20, I18n.format("gui.worldhandler.scoreboard.objectives.objective")); this.objectField.setValidator(Predicates.notNull()); this.objectField.setText(ContentScoreboard.getObjective()); - this.objectField.func_212954_a(text -> + this.objectField.setResponder(text -> { ContentScoreboard.setObjective(text); this.builderObjectives.setObjective(ContentScoreboard.getObjective()); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java index 30bfd04..f32e4fc 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardPlayers.java @@ -80,7 +80,7 @@ public class ContentScoreboardPlayers extends ContentScoreboard this.objectField = new GuiTextFieldTooltip(x + 118, y, 114, 20, I18n.format("gui.worldhandler.scoreboard.objectives.objective")); this.objectField.setValidator(Predicates.notNull()); this.objectField.setText(ContentScoreboard.getObjective()); - this.objectField.func_212954_a(text -> + this.objectField.setResponder(text -> { ContentScoreboard.setObjective(text); this.builderPlayers.setObjective(ContentScoreboard.getObjective()); @@ -91,7 +91,7 @@ public class ContentScoreboardPlayers extends ContentScoreboard this.tagField = new GuiTextFieldTooltip(x + 118, y + 12, 114, 20, I18n.format("gui.worldhandler.scoreboard.players.tag")); this.tagField.setValidator(string -> string != null && !string.contains(" ")); this.tagField.setText(this.tag); - this.tagField.func_212954_a(text -> + this.tagField.setResponder(text -> { this.tag = text; this.builderTag.setName(this.tag); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java index 03fce66..ceeb7cf 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java @@ -45,7 +45,7 @@ public class ContentScoreboardTeams extends ContentScoreboard this.teamField = new GuiTextFieldTooltip(x + 118, y + (this.selectedTeam.equals("option") ? 0 : (this.selectedTeam.equals("add") ? 24 : 12)), 114, 20, I18n.format("gui.worldhandler.scoreboard.team.team")); this.teamField.setValidator(Predicates.notNull()); this.teamField.setText(this.team); - this.teamField.func_212954_a(text -> + this.teamField.setResponder(text -> { this.team = text; this.builderTeams.setTeam(this.team); 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 f0e623d..ea41e8f 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java @@ -64,7 +64,7 @@ public class ContentSignEditor extends Content this.commandField.setValidator(Predicates.notNull()); this.commandField.setText(this.builderSignEditor.getCommand(this.selectedLine)); this.commandField.setCursorPositionEnd(); - this.commandField.func_212954_a(text -> + this.commandField.setResponder(text -> { this.builderSignEditor.setCommand(this.selectedLine, text); container.initButtons(); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java index 76e7963..3dda62a 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java @@ -103,7 +103,7 @@ public class ContentSummon extends Content this.mobField = new GuiTextFieldTooltip(x + 118, y, 114, 20, I18n.format("gui.worldhandler.entities.summon.start.mob_id") + " (" + I18n.format("gui.worldhandler.generic.name") + ")"); this.mobField.setValidator(Predicates.notNull()); this.mobField.setText(this.mob); - this.mobField.func_212954_a(text -> + this.mobField.setResponder(text -> { this.mob = text; this.builderSummon.setEntity(this.mob); @@ -113,7 +113,7 @@ public class ContentSummon extends Content this.customNameField = new GuiTextFieldTooltip(x + 118, y + 24, 114, 20, I18n.format("gui.worldhandler.entities.summon.start.custom_name")); this.customNameField.setValidator(Predicates.notNull()); this.customNameField.setText(this.name); - this.customNameField.func_212954_a(text -> + this.customNameField.setResponder(text -> { this.name = text; this.builderSummon.setCustomName(this.name); @@ -123,7 +123,7 @@ public class ContentSummon extends Content this.passengerField = new GuiTextFieldTooltip(x + 118, y + 48, 114, 20, I18n.format("gui.worldhandler.entities.summon.start.passenger_mob_id")); this.passengerField.setValidator(Predicates.notNull()); this.passengerField.setText(this.passenger); - this.passengerField.func_212954_a(text -> + this.passengerField.setResponder(text -> { this.passenger = this.passengerField.getText(); this.builderSummon.setPassenger(this.passenger);