diff --git a/build.properties b/build.properties index 46cec8e4..f09f14b5 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ mod_version=1.1.3 minecraft_version=1.10.2 -forge_version=12.18.1.2084 -mappings=snapshot_20160701 +forge_version=12.18.3.2185 +mappings=stable_29 -jei_version=3.7.+ +jei_version=3.10.0.+ configurate_version=3.1.1 diff --git a/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java b/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java index fd4b3f4c..66f9cf9c 100644 --- a/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java +++ b/src/main/java/slimeknights/mantle/client/ExtraHeartRenderHandler.java @@ -67,7 +67,7 @@ public void renderHealthbar(RenderGameOverlayEvent.Pre event) { GlStateManager.enableBlend(); EntityPlayer player = (EntityPlayer)this.mc.getRenderViewEntity(); - int health = MathHelper.ceiling_float_int(player.getHealth()); + int health = MathHelper.ceil(player.getHealth()); boolean highlight = healthUpdateCounter > (long)updateCounter && (healthUpdateCounter - (long)updateCounter) / 3L %2L == 1L; if (health < this.playerHealth && player.hurtResistantTime > 0) @@ -93,14 +93,14 @@ else if (health > this.playerHealth && player.hurtResistantTime > 0) IAttributeInstance attrMaxHealth = player.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH); float healthMax = (float)attrMaxHealth.getAttributeValue(); - float absorb = MathHelper.ceiling_float_int(player.getAbsorptionAmount()); + float absorb = MathHelper.ceil(player.getAbsorptionAmount()); // CHANGE: simulate 10 hearts max if there's more, so vanilla only renders one row max healthMax = Math.min(healthMax, 20f); health = Math.min(health, 20); absorb = Math.min(absorb, 20); - int healthRows = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F / 10.0F); + int healthRows = MathHelper.ceil((healthMax + absorb) / 2.0F / 10.0F); int rowHeight = Math.max(10 - (healthRows - 2), 3); this.rand.setSeed((long)(updateCounter * 312871)); @@ -116,17 +116,17 @@ else if (health > this.playerHealth && player.hurtResistantTime > 0) regen = updateCounter % 25; } - final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); + final int TOP = 9 * (mc.world.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); final int BACKGROUND = (highlight ? 25 : 16); int MARGIN = 16; if (player.isPotionActive(MobEffects.POISON)) MARGIN += 36; else if (player.isPotionActive(MobEffects.WITHER)) MARGIN += 72; float absorbRemaining = absorb; - for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; i >= 0; --i) + for (int i = MathHelper.ceil((healthMax + absorb) / 2.0F) - 1; i >= 0; --i) { //int b0 = (highlight ? 1 : 0); - int row = MathHelper.ceiling_float_int((float)(i + 1) / 10.0F) - 1; + int row = MathHelper.ceil((float)(i + 1) / 10.0F) - 1; int x = left + i % 10 * 8; int y = top - row * rowHeight; @@ -188,7 +188,7 @@ private void renderExtraHearts(int xBasePos, int yBasePos, EntityPlayer player) // Extra hearts this.mc.getTextureManager().bindTexture(ICON_HEARTS); - int hp = MathHelper.ceiling_float_int(player.getHealth()); + int hp = MathHelper.ceil(player.getHealth()); renderCustomHearts(xBasePos, yBasePos, potionOffset, hp, false); } @@ -228,7 +228,7 @@ private int getPotionOffset(EntityPlayer player) { if(potion != null) { potionOffset = 9; } - if(mc.theWorld.getWorldInfo().isHardcoreModeEnabled()) { + if(mc.world.getWorldInfo().isHardcoreModeEnabled()) { potionOffset += 27; } return potionOffset; @@ -240,7 +240,7 @@ private void renderExtraAbsorption(int xBasePos, int yBasePos, EntityPlayer play // Extra hearts this.mc.getTextureManager().bindTexture(ICON_ABSORB); - int absorb = MathHelper.ceiling_float_int(player.getAbsorptionAmount()); + int absorb = MathHelper.ceil(player.getAbsorptionAmount()); renderCustomHearts(xBasePos, yBasePos, potionOffset, absorb, true); } } diff --git a/src/main/java/slimeknights/mantle/client/book/StructureInfo.java b/src/main/java/slimeknights/mantle/client/book/StructureInfo.java index 96af25cf..3039e701 100644 --- a/src/main/java/slimeknights/mantle/client/book/StructureInfo.java +++ b/src/main/java/slimeknights/mantle/client/book/StructureInfo.java @@ -62,7 +62,7 @@ private IBlockState convert(BlockData data) { state = block.getDefaultState(); for(Map.Entry entry : data.state.entrySet()) { - Optional> property = state.getPropertyNames().stream().filter(iProperty -> entry.getKey().equals(iProperty.getName())).findFirst(); + Optional> property = state.getPropertyKeys().stream().filter(iProperty -> entry.getKey().equals(iProperty.getName())).findFirst(); if(property.isPresent()) { state = setProperty(state, property.get(), entry.getValue()); diff --git a/src/main/java/slimeknights/mantle/client/book/data/BookData.java b/src/main/java/slimeknights/mantle/client/book/data/BookData.java index 2e5f6c8a..51033c59 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/BookData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/BookData.java @@ -306,9 +306,9 @@ public String translate(String string) { } public void openGui(@Nullable ItemStack item) { - if(Minecraft.getMinecraft().thePlayer != null) { + if(Minecraft.getMinecraft().player != null) { Minecraft.getMinecraft() - .displayGuiScreen(new GuiBook(this, Minecraft.getMinecraft().thePlayer.getStatFileWriter(), item)); + .displayGuiScreen(new GuiBook(this, Minecraft.getMinecraft().player.getStatFileWriter(), item)); } } diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java b/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java index 7e7a43c3..c584709c 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java @@ -127,7 +127,7 @@ protected void drawContainerName() { } protected void drawPlayerInventoryName() { - String localizedName = Minecraft.getMinecraft().thePlayer.inventory.getDisplayName().getUnformattedText(); + String localizedName = Minecraft.getMinecraft().player.inventory.getDisplayName().getUnformattedText(); this.fontRendererObj.drawString(localizedName, 8, this.ySize - 96 + 2, 0x404040); } @@ -222,8 +222,8 @@ public void drawSlot(Slot slotIn) { // update slot positions if(slotIn instanceof SlotWrapper) { - slotIn.xDisplayPosition = ((SlotWrapper) slotIn).parent.xDisplayPosition; - slotIn.yDisplayPosition = ((SlotWrapper) slotIn).parent.yDisplayPosition; + slotIn.xPos = ((SlotWrapper) slotIn).parent.xPos; + slotIn.yPos = ((SlotWrapper) slotIn).parent.yPos; } super.drawSlot(slotIn); diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiWidgetSlider.java b/src/main/java/slimeknights/mantle/client/gui/GuiWidgetSlider.java index b4ee5932..cc9f6332 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiWidgetSlider.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiWidgetSlider.java @@ -50,7 +50,7 @@ public GuiWidgetSlider(GuiElement slider, GuiElement sliderHighlighted, GuiEleme maxValue = slideBar.h; increment = 1; - sliderOffset = MathHelper.abs_int(slideBar.w - slider.w) / 2; + sliderOffset = MathHelper.abs(slideBar.w - slider.w) / 2; isScrolling = false; isHighlighted = false; diff --git a/src/main/java/slimeknights/mantle/client/gui/book/BoxRenderer.java b/src/main/java/slimeknights/mantle/client/gui/book/BoxRenderer.java index 24eb252a..db4d11c1 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/BoxRenderer.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/BoxRenderer.java @@ -49,14 +49,14 @@ public static int[] getTextureMatrixCoords(int index, int sprW, int sprH, int se int totalHeight = segH * 3 + segGH * 2; return getTextureMatrixCoords((index % (256 / sprW) * sprW) + (sprW / 2 - totalWidth / 2), (MathHelper - .floor_float(index / (256F / sprH)) * sprH) + (sprH / 2 - totalHeight / 2), segW, segH, segGW, segGH, segId); + .floor(index / (256F / sprH)) * sprH) + (sprH / 2 - totalHeight / 2), segW, segH, segGW, segGH, segId); } public static int[] getTextureMatrixCoords(int u, int v, int segW, int segH, int segGW, int segGH, int segId) { int[] coords = new int[4]; int col = segId % 3; - int row = MathHelper.floor_float(segId / 3F); + int row = MathHelper.floor(segId / 3F); coords[0] = u + col * segW + col * segGW; coords[1] = v + row * segH + row * segGH; diff --git a/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java b/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java index 32fa2341..088a68ce 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java @@ -623,7 +623,7 @@ public void onGuiClosed() { if(loadingAchievements) { return; } - if(mc.thePlayer == null) { + if(mc.player == null) { return; } @@ -634,9 +634,9 @@ public void onGuiClosed() { } if(this.page == -1) { - BookLoader.updateSavedPage(mc.thePlayer, item, ""); + BookLoader.updateSavedPage(mc.player, item, ""); } else if(page != null && page.parent != null) { - BookLoader.updateSavedPage(mc.thePlayer, item, page.parent.name + "." + page.name); + BookLoader.updateSavedPage(mc.player, item, page.parent.name + "." + page.name); } } diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java b/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java index 985d91cb..ac910123 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/BookElement.java @@ -54,7 +54,7 @@ public void mouseDragged(int clickX, int clickY, int mx, int my, int lastX, int public void renderToolTip(FontRenderer fontRenderer, ItemStack stack, int x, int y) { if(stack != null) { - List list = stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips); + List list = stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips); for(int i = 0; i < list.size(); ++i) { if(i == 0) { diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java index fb07bcbf..533e20b1 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementItem.java @@ -54,7 +54,7 @@ public ElementItem(int x, int y, float scale, ItemStack... itemCycle) { } public ElementItem(int x, int y, float scale, ItemStack[] itemCycle, String action) { - super(x, y, MathHelper.floor_float(ITEM_SIZE_HARDCODED * scale), MathHelper.floor_float(ITEM_SIZE_HARDCODED * scale)); + super(x, y, MathHelper.floor(ITEM_SIZE_HARDCODED * scale), MathHelper.floor(ITEM_SIZE_HARDCODED * scale)); this.itemCycle = itemCycle; this.scale = scale; diff --git a/src/main/java/slimeknights/mantle/config/ExampleSync.java b/src/main/java/slimeknights/mantle/config/ExampleSync.java index d39aee82..3fcc20cc 100644 --- a/src/main/java/slimeknights/mantle/config/ExampleSync.java +++ b/src/main/java/slimeknights/mantle/config/ExampleSync.java @@ -43,12 +43,12 @@ public void playerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { @SubscribeEvent @SideOnly(Side.CLIENT) public void playerJoinedWorld(TickEvent.ClientTickEvent event) { - EntityPlayerSP player = Minecraft.getMinecraft().thePlayer; + EntityPlayerSP player = Minecraft.getMinecraft().player; if(needsRestart) { - player.addChatMessage(new TextComponentString("Configs synced with server. Configs require a restart")); + player.sendMessage(new TextComponentString("Configs synced with server. Configs require a restart")); } else { - player.addChatMessage(new TextComponentString("Configs synced with server.")); + player.sendMessage(new TextComponentString("Configs synced with server.")); } MinecraftForge.EVENT_BUS.unregister(this); } diff --git a/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java b/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java index 6f7d198c..1d904acd 100644 --- a/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java +++ b/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java @@ -19,7 +19,7 @@ public class SlotWrapper extends Slot { public final Slot parent; public SlotWrapper(Slot slot) { - super(slot.inventory, slot.getSlotIndex(), slot.xDisplayPosition, slot.yDisplayPosition); + super(slot.inventory, slot.getSlotIndex(), slot.xPos, slot.yPos); this.parent = slot; } diff --git a/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java b/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java index a9d4f93e..c458dd2a 100644 --- a/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java +++ b/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java @@ -36,7 +36,7 @@ public boolean hasValidMaster() { return false; } - if(this.worldObj.getBlockState(this.master).getBlock() == this.masterBlock && this.worldObj + if(this.world.getBlockState(this.master).getBlock() == this.masterBlock && this.world .getBlockState(this.master) == this.state) { return true; } @@ -55,7 +55,7 @@ public BlockPos getMasterPosition() { public void overrideMaster(BlockPos pos) { this.hasMaster = true; this.master = pos; - this.state = this.worldObj.getBlockState(this.master); + this.state = this.world.getBlockState(this.master); this.masterBlock = this.state.getBlock(); } @@ -73,7 +73,7 @@ public boolean setPotentialMaster(IMasterLogic master, World w, BlockPos pos) { @Deprecated public boolean verifyMaster(IMasterLogic logic, BlockPos pos) { - return this.master.equals(pos) && this.worldObj.getBlockState(pos) == this.state && this.worldObj.getBlockState(pos) + return this.master.equals(pos) && this.world.getBlockState(pos) == this.state && this.world.getBlockState(pos) .getBlock() == this.masterBlock; } @@ -97,7 +97,7 @@ public void invalidateMaster(IMasterLogic master, World w, BlockPos pos) { @Override public void notifyMasterOfChange() { if(this.hasValidMaster()) { - IMasterLogic logic = (IMasterLogic) this.worldObj.getTileEntity(this.master); + IMasterLogic logic = (IMasterLogic) this.world.getTileEntity(this.master); logic.notifyChange(this, this.pos); } } @@ -151,20 +151,20 @@ public NBTTagCompound getUpdateTag() { @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { this.readCustomNBT(packet.getNbtCompound()); - this.worldObj.notifyLightSet(this.pos); - IBlockState state = worldObj.getBlockState(this.pos); - this.worldObj.notifyBlockUpdate(this.pos, state, state, 3); + this.world.notifyLightSet(this.pos); + IBlockState state = world.getBlockState(this.pos); + this.world.notifyBlockUpdate(this.pos, state, state, 3); } @Nonnull @Override public World getWorld() { - return this.worldObj; + return this.world; } @Deprecated public boolean setMaster(BlockPos pos) { - if(!this.hasMaster || this.worldObj.getBlockState(this.master) != this.state || (this.worldObj + if(!this.hasMaster || this.world.getBlockState(this.master) != this.state || (this.world .getBlockState(this.master) .getBlock() != this.masterBlock)) { this.overrideMaster(pos); diff --git a/src/main/java/slimeknights/mantle/tileentity/TileInventory.java b/src/main/java/slimeknights/mantle/tileentity/TileInventory.java index 19a83b5b..81a8fc47 100644 --- a/src/main/java/slimeknights/mantle/tileentity/TileInventory.java +++ b/src/main/java/slimeknights/mantle/tileentity/TileInventory.java @@ -185,9 +185,9 @@ public ITextComponent getDisplayName() { /* Supporting methods */ @Override - public boolean isUseableByPlayer(@Nonnull EntityPlayer entityplayer) { + public boolean isUsableByPlayer(@Nonnull EntityPlayer entityplayer) { // block changed/got broken? - if(worldObj.getTileEntity(pos) != this || worldObj.getBlockState(pos).getBlock() == Blocks.AIR) { + if(world.getTileEntity(pos) != this || world.getBlockState(pos).getBlock() == Blocks.AIR) { return false; }