diff --git a/src/main/java/exopandora/worldhandler/builder/component/abstr/ComponentPotion.java b/src/main/java/exopandora/worldhandler/builder/component/abstr/ComponentPotion.java index da5ce12..89f0b84 100644 --- a/src/main/java/exopandora/worldhandler/builder/component/abstr/ComponentPotion.java +++ b/src/main/java/exopandora/worldhandler/builder/component/abstr/ComponentPotion.java @@ -34,7 +34,7 @@ public abstract class ComponentPotion implements IBuilderComponent { CompoundNBT compound = new CompoundNBT(); - compound.putByte("Id", (byte) Effect.getIdFromPotion(entry.getKey())); + compound.putByte("Id", (byte) Effect.getId(entry.getKey())); compound.putByte("Amplifier", (byte) (potion.getAmplifier() - 1)); compound.putInt("Duration", Math.min(potion.toTicks(), 1000000)); compound.putBoolean("Ambient", potion.getAmbient()); diff --git a/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java b/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java index c4453fd..ce02c84 100644 --- a/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java +++ b/src/main/java/exopandora/worldhandler/event/ClientEventHandler.java @@ -27,7 +27,7 @@ public class ClientEventHandler @SubscribeEvent public static void renderWorldLastEvent(RenderWorldLastEvent event) { - if(Config.getSettings().highlightBlocks() && Minecraft.getInstance().world != null && Minecraft.getInstance().getRenderManager().field_217783_c != null) + if(Config.getSettings().highlightBlocks() && Minecraft.getInstance().world != null && Minecraft.getInstance().getRenderManager().info != null) { GlStateManager.pushMatrix(); GlStateManager.disableAlphaTest(); @@ -38,7 +38,7 @@ public class ClientEventHandler GlStateManager.depthMask(false); final double constant = 0.0020000000949949026D; - Vec3d projected = Minecraft.getInstance().getRenderManager().field_217783_c.func_216785_c(); + Vec3d projected = Minecraft.getInstance().getRenderManager().info.getProjectedView(); double minX = Math.min(BlockHelper.getPos1().getX(), BlockHelper.getPos2().getX()) - constant - projected.x; double minY = Math.min(BlockHelper.getPos1().getY(), BlockHelper.getPos2().getY()) - constant - projected.y; diff --git a/src/main/java/exopandora/worldhandler/event/KeyHandler.java b/src/main/java/exopandora/worldhandler/event/KeyHandler.java index 1c9e384..7162b74 100644 --- a/src/main/java/exopandora/worldhandler/event/KeyHandler.java +++ b/src/main/java/exopandora/worldhandler/event/KeyHandler.java @@ -16,7 +16,7 @@ public class KeyHandler @SubscribeEvent public static void keyInputEvent(KeyInputEvent event) { - if(Minecraft.getInstance() != null && Minecraft.getInstance().field_71462_r == null) + if(Minecraft.getInstance() != null && Minecraft.getInstance().currentScreen == null) { if(WorldHandler.KEY_WORLD_HANDLER.isPressed()) { diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTooltip.java b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTooltip.java index 9012641..85ed7cd 100644 --- a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTooltip.java +++ b/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTooltip.java @@ -29,8 +29,8 @@ public class GuiButtonTooltip extends GuiButtonBase if(!list.isEmpty()) { int tooltipWidth = Minecraft.getInstance().fontRenderer.getStringWidth(this.tooltip) + 9; - int width = Minecraft.getInstance().field_71462_r.width; - int height = Minecraft.getInstance().field_71462_r.height; + int width = Minecraft.getInstance().currentScreen.width; + int height = Minecraft.getInstance().currentScreen.height; GuiUtils.drawHoveringText(list, mouseX, mouseY, width, height, tooltipWidth, Minecraft.getInstance().fontRenderer); } 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 11378e9..2204ab5 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java @@ -1,8 +1,12 @@ package exopandora.worldhandler.gui.content.impl; import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; import com.google.common.base.Predicates; +import com.mojang.brigadier.arguments.ArgumentType; +import com.mojang.brigadier.arguments.BoolArgumentType; import exopandora.worldhandler.builder.ICommandBuilder; import exopandora.worldhandler.builder.impl.BuilderGamerule; @@ -21,7 +25,10 @@ import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; import net.minecraft.client.resources.I18n; import net.minecraft.world.GameRules; -import net.minecraft.world.GameRules.ValueType; +import net.minecraft.world.GameRules.IRuleEntryVisitor; +import net.minecraft.world.GameRules.RuleKey; +import net.minecraft.world.GameRules.RuleType; +import net.minecraft.world.GameRules.RuleValue; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -54,7 +61,18 @@ public class ContentGamerules extends Content this.builderGamerule.setValue(this.value); }); - ElementPageList rules = new ElementPageList(x, y, new ArrayList(GameRules.getDefinitions().keySet()), 114, 20, 3, container, new ILogicPageList() + Map> map = new HashMap>(); + + GameRules.func_223590_a(new IRuleEntryVisitor() + { + @Override + public > void func_223481_a(RuleKey rule, RuleType type) + { + map.put(rule.func_223576_a(), type.func_223581_a(null).getType()); + } + }); + + ElementPageList rules = new ElementPageList(x, y, new ArrayList(map.keySet()), 114, 20, 3, container, new ILogicPageList() { @Override public String translate(String item) @@ -72,7 +90,7 @@ public class ContentGamerules extends Content public void onClick(String item) { ContentGamerules.this.builderGamerule.setRule(item); - ContentGamerules.this.booleanValue = GameRules.getDefinitions().get(item).getType().equals(ValueType.BOOLEAN_VALUE); + ContentGamerules.this.booleanValue = map.get(item) instanceof BoolArgumentType; if(ContentGamerules.this.booleanValue) { 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 d6cc96f..5808847 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java @@ -185,7 +185,7 @@ public class ContentSignEditor extends Content GlStateManager.translatef(container.width / 2 - 8.5F * scale, container.height / 2 - 15 - 8.5F * scale, 0); GlStateManager.scalef(scale, scale, scale); - Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(new ItemStack(Items.field_222071_kr), 0, 0); + Minecraft.getInstance().getItemRenderer().renderItemIntoGUI(new ItemStack(Items.OAK_SIGN), 0, 0); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); 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 3cf3934..76e7963 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java @@ -271,7 +271,7 @@ public class ContentSummon extends Content { Effect potion = ForgeRegistries.POTIONS.getValue(location); - if(!potion.equals(Effects.field_76432_h) && !potion.equals(Effects.field_76433_i)) + if(!potion.equals(Effects.INSTANT_DAMAGE) && !potion.equals(Effects.INSTANT_HEALTH)) { if(this.potionPage == 0) { diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java index 9ba3582..cb86c6b 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentWorldInfo.java @@ -169,7 +169,7 @@ public class ContentWorldInfo extends Content { if(Minecraft.getInstance().getIntegratedServer() != null) { - return Minecraft.getInstance().getIntegratedServer().getWorld(DimensionType.OVERWORLD); + return Minecraft.getInstance().getIntegratedServer().getWorld(DimensionType.field_223227_a_); } return Minecraft.getInstance().world; diff --git a/src/main/java/exopandora/worldhandler/helper/ActionHelper.java b/src/main/java/exopandora/worldhandler/helper/ActionHelper.java index d8e4ff2..b6c8652 100644 --- a/src/main/java/exopandora/worldhandler/helper/ActionHelper.java +++ b/src/main/java/exopandora/worldhandler/helper/ActionHelper.java @@ -146,7 +146,7 @@ public class ActionHelper TranslationTextComponent message = new TranslationTextComponent("worldhandler.error.gui", name); message.setStyle(new Style().setColor(net.minecraft.util.text.TextFormatting.RED)); - Minecraft.getInstance().field_71456_v.addChatMessage(ChatType.SYSTEM, message); + Minecraft.getInstance().ingameGUI.addChatMessage(ChatType.SYSTEM, message); WorldHandler.LOGGER.throwing(e); } } @@ -155,8 +155,8 @@ public class ActionHelper { if(!CommandHelper.canPlayerIssueCommand() && Config.getSettings().permissionQuery()) { - Minecraft.getInstance().field_71456_v.addChatMessage(ChatType.SYSTEM, new StringTextComponent(TextFormatting.RED + I18n.format("worldhandler.permission.refused"))); - Minecraft.getInstance().field_71456_v.addChatMessage(ChatType.SYSTEM, new StringTextComponent(TextFormatting.RED + I18n.format("worldhandler.permission.refused.change", I18n.format("gui.worldhandler.config.key.settings.permission_query")))); + Minecraft.getInstance().ingameGUI.addChatMessage(ChatType.SYSTEM, new StringTextComponent(TextFormatting.RED + I18n.format("worldhandler.permission.refused"))); + Minecraft.getInstance().ingameGUI.addChatMessage(ChatType.SYSTEM, new StringTextComponent(TextFormatting.RED + I18n.format("worldhandler.permission.refused.change", I18n.format("gui.worldhandler.config.key.settings.permission_query")))); } else { diff --git a/src/main/java/exopandora/worldhandler/helper/RegistryHelper.java b/src/main/java/exopandora/worldhandler/helper/RegistryHelper.java index c8b10ab..f8c8360 100644 --- a/src/main/java/exopandora/worldhandler/helper/RegistryHelper.java +++ b/src/main/java/exopandora/worldhandler/helper/RegistryHelper.java @@ -13,7 +13,6 @@ import net.minecraft.entity.EntityType; import net.minecraft.item.Item; import net.minecraft.potion.Effect; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -26,7 +25,6 @@ import net.minecraftforge.registries.IForgeRegistryEntry; public class RegistryHelper { private static final Map, Function> FORGE = new HashMap, Function>(); - private static final Map, Function> VANILLA = new HashMap, Function>(); static { @@ -36,7 +34,7 @@ public class RegistryHelper registerRegistry(ForgeRegistries.BIOMES, Biome::getTranslationKey); registerRegistry(ForgeRegistries.ENCHANTMENTS, Enchantment::getName); registerRegistry(ForgeRegistries.ENTITIES, EntityType::getTranslationKey); - registerRegistry(Registry.field_212623_l, stat -> "stat." + stat.toString().replace(':', '.')); + registerRegistry(ForgeRegistries.STAT_TYPES, stat -> "stat." + stat.toString().replace(':', '.')); } private static > void registerRegistry(IForgeRegistry registry, Function mapper) @@ -44,11 +42,6 @@ public class RegistryHelper FORGE.put(registry, mapper); } - private static void registerRegistry(Registry registry, Function mapper) - { - VANILLA.put(registry, mapper); - } - @Nullable @SuppressWarnings("unchecked") public static String translate(ResourceLocation resource) @@ -61,14 +54,6 @@ public class RegistryHelper } } - for(Registry registry : VANILLA.keySet()) - { - if(registry.containsKey(resource)) - { - return ((Function) VANILLA.get(registry)).apply((T) registry.getOrDefault(resource)); - } - } - return null; }