diff --git a/build.properties b/build.properties index ab80144b9..775bfd64b 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ minecraft_version=1.12.2 -forge_version=14.23.0.2491 +forge_version=14.23.0.2528 mod_version=7.0.1 -mappings_version=snapshot_nodoc_20170619 +mappings_version=snapshot_nodoc_20171031 diff --git a/src/main/java/biomesoplenty/client/gui/GuiBOPPageList.java b/src/main/java/biomesoplenty/client/gui/GuiBOPPageList.java index d01b380b5..798bb28ac 100644 --- a/src/main/java/biomesoplenty/client/gui/GuiBOPPageList.java +++ b/src/main/java/biomesoplenty/client/gui/GuiBOPPageList.java @@ -53,7 +53,7 @@ public abstract class GuiBOPPageList extends GuiBOPPageDelegate @Override protected void updateItemPos(int p_178040_1_, int p_178040_2_, int p_178040_3_, float partialTicks) { - this.getListEntry(p_178040_1_).func_192633_a(p_178040_1_, p_178040_2_, p_178040_3_, partialTicks); + this.getListEntry(p_178040_1_).updatePosition(p_178040_1_, p_178040_2_, p_178040_3_, partialTicks); } @Override @@ -268,8 +268,7 @@ public abstract class GuiBOPPageList extends GuiBOPPageDelegate } // setSelected - @Override - public void func_192633_a(int p_178011_1_, int p_178011_2_, int p_178011_3_, float partialTicks) + public void updatePosition(int p_178011_1_, int p_178011_2_, int p_178011_3_, float partialTicks) { this.drawGui(this.guiLeft, p_178011_3_, 0, 0, true, partialTicks); this.drawGui(this.guiRight, p_178011_3_, 0, 0, true, partialTicks); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java index 7af1ae49b..33029115d 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java @@ -158,21 +158,16 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHo @SideOnly(Side.CLIENT) public IItemColor getItemColor() { - return new IItemColor() - { - @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) + return (stack, tintIndex) -> { + IBlockState state = ((ItemBlock)stack.getItem()).getBlock().getStateFromMeta(stack.getMetadata()); + + switch ((BOPPlants) state.getValue(BlockBOPPlant.this.variantProperty)) { - IBlockState state = ((ItemBlock)stack.getItem()).getBlock().getStateFromMeta(stack.getMetadata()); - - switch ((BOPPlants) state.getValue(BlockBOPPlant.this.variantProperty)) - { - case BUSH: case BERRYBUSH: case SHRUB: - return 0xFFFFFF; - - default: - return BlockBOPPlant.this.getBlockColor().colorMultiplier(state, null, null, tintIndex); - } + case BUSH: case BERRYBUSH: case SHRUB: + return 0xFFFFFF; + + default: + return BlockBOPPlant.this.getBlockColor().colorMultiplier(state, null, null, tintIndex); } }; } diff --git a/src/main/java/biomesoplenty/common/block/BlockColoring.java b/src/main/java/biomesoplenty/common/block/BlockColoring.java index 2b1a7a7f6..aade807de 100644 --- a/src/main/java/biomesoplenty/common/block/BlockColoring.java +++ b/src/main/java/biomesoplenty/common/block/BlockColoring.java @@ -42,14 +42,9 @@ public class BlockColoring } }; - public static final IItemColor BLOCK_ITEM_COLORING = new IItemColor() - { - @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) - { - IBlockState state = ((ItemBlock)stack.getItem()).getBlock().getStateFromMeta(stack.getMetadata()); - IBlockColor blockColor = ((IBOPBlock)state.getBlock()).getBlockColor(); - return blockColor == null ? 0xFFFFFF : blockColor.colorMultiplier(state, null, null, tintIndex); - } + public static final IItemColor BLOCK_ITEM_COLORING = (stack, tintIndex) -> { + IBlockState state = ((ItemBlock)stack.getItem()).getBlock().getStateFromMeta(stack.getMetadata()); + IBlockColor blockColor = ((IBOPBlock)state.getBlock()).getBlockColor(); + return blockColor == null ? 0xFFFFFF : blockColor.colorMultiplier(state, null, null, tintIndex); }; } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/crafting/BiomeEssenceRecipe.java b/src/main/java/biomesoplenty/common/crafting/BiomeEssenceRecipe.java index dcfdf621d..7ee2159dc 100644 --- a/src/main/java/biomesoplenty/common/crafting/BiomeEssenceRecipe.java +++ b/src/main/java/biomesoplenty/common/crafting/BiomeEssenceRecipe.java @@ -93,7 +93,7 @@ public class BiomeEssenceRecipe extends net.minecraftforge.registries.IForgeRegi } @Override - public boolean isHidden() + public boolean isDynamic() { return true; } diff --git a/src/main/java/biomesoplenty/common/entities/ai/EntityAIEatBOPGrass.java b/src/main/java/biomesoplenty/common/entities/ai/EntityAIEatBOPGrass.java index c35d75f7d..40cf662f2 100644 --- a/src/main/java/biomesoplenty/common/entities/ai/EntityAIEatBOPGrass.java +++ b/src/main/java/biomesoplenty/common/entities/ai/EntityAIEatBOPGrass.java @@ -58,7 +58,7 @@ public class EntityAIEatBOPGrass extends EntityAIEatGrass { this.bopEatingGrassTimer = 40; this.world.setEntityState(this.sheep, (byte)10); - this.sheep.getNavigator().clearPathEntity(); + this.sheep.getNavigator().clearPath(); } @Override diff --git a/src/main/java/biomesoplenty/common/item/ItemMudball.java b/src/main/java/biomesoplenty/common/item/ItemMudball.java index 41150944e..ea85868a1 100644 --- a/src/main/java/biomesoplenty/common/item/ItemMudball.java +++ b/src/main/java/biomesoplenty/common/item/ItemMudball.java @@ -42,7 +42,7 @@ public class ItemMudball extends Item if (!world.isRemote) { EntityMudball mudball = new EntityMudball(world, player); - mudball.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); + mudball.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); world.spawnEntity(mudball); } diff --git a/src/main/java/biomesoplenty/common/world/BOPMapGenScatteredFeature.java b/src/main/java/biomesoplenty/common/world/BOPMapGenScatteredFeature.java index 6f5d4b041..ef35f16aa 100644 --- a/src/main/java/biomesoplenty/common/world/BOPMapGenScatteredFeature.java +++ b/src/main/java/biomesoplenty/common/world/BOPMapGenScatteredFeature.java @@ -56,7 +56,7 @@ public class BOPMapGenScatteredFeature extends MapGenScatteredFeature for (Entry entry : p_i2061_1_.entrySet()) { - if (((String)entry.getKey()).equals("distance")) + if (entry.getKey().equals("distance")) { this.maxDistanceBetweenScatteredFeatures = MathHelper.getInt((String)entry.getValue(), this.maxDistanceBetweenScatteredFeatures, 9); } @@ -126,7 +126,7 @@ public class BOPMapGenScatteredFeature extends MapGenScatteredFeature if (structurestart != null && structurestart instanceof BOPMapGenScatteredFeature.Start && !structurestart.getComponents().isEmpty()) { - StructureComponent structurecomponent = (StructureComponent)structurestart.getComponents().get(0); + StructureComponent structurecomponent = structurestart.getComponents().get(0); return structurecomponent instanceof ComponentScatteredFeaturePieces.SwampHut; } else @@ -136,7 +136,7 @@ public class BOPMapGenScatteredFeature extends MapGenScatteredFeature } @Override - public List getScatteredFeatureSpawnList() + public List getMonsters() { return this.scatteredFeatureSpawnList; } diff --git a/src/main/java/biomesoplenty/common/world/ChunkGeneratorOverworldBOP.java b/src/main/java/biomesoplenty/common/world/ChunkGeneratorOverworldBOP.java index 1f2ea17c2..2a09aa5f9 100644 --- a/src/main/java/biomesoplenty/common/world/ChunkGeneratorOverworldBOP.java +++ b/src/main/java/biomesoplenty/common/world/ChunkGeneratorOverworldBOP.java @@ -620,12 +620,12 @@ public class ChunkGeneratorOverworldBOP implements IChunkGenerator { if (creatureType == EnumCreatureType.MONSTER && this.scatteredFeatureGenerator.isSwampHut(pos)) { - return this.scatteredFeatureGenerator.getScatteredFeatureSpawnList(); + return this.scatteredFeatureGenerator.getMonsters(); } if (creatureType == EnumCreatureType.MONSTER && this.settings.useMonuments && this.oceanMonumentGenerator.isPositionInStructure(this.world, pos)) { - return this.oceanMonumentGenerator.getScatteredFeatureSpawnList(); + return this.oceanMonumentGenerator.getMonsters(); } }