diff --git a/build.properties b/build.properties index 29055ca3d..f42abfa4f 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Tue Jun 13 14:30:58 BST 2017 mod_name=Botania cf_meta_version=1.12 -forge_version=14.21.0.2361 +forge_version=14.21.0.2362 dir_repo=./ mc_mappings=snapshot_20170624 version=r1.9 diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 14ef6a4af..89787558f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -14,8 +14,8 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.common.registry.RegistryDelegate; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.registries.IRegistryDelegate; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; @@ -41,7 +41,7 @@ public final class ColorHandler { public static void init() { BlockColors blocks = Minecraft.getMinecraft().getBlockColors(); - Map, IBlockColor> map = ReflectionHelper.getPrivateValue(BlockColors.class, blocks, "blockColorMap"); + Map, IBlockColor> map = ReflectionHelper.getPrivateValue(BlockColors.class, blocks, "blockColorMap"); // Steal vine colorer blocks.registerBlockColorHandler(map.get(Blocks.VINE.delegate), ModBlocks.solidVines); @@ -108,7 +108,7 @@ public final class ColorHandler { ModItems.twigWand); items.registerItemColorHandler((s, t) -> EnumDyeColor.byMetadata(s.getItemDamage()).getColorValue(), ModItems.dye, ModItems.petal); - items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).block.getStateFromMeta(s.getMetadata()), null, null, t), + items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).getBlock().getStateFromMeta(s.getMetadata()), null, null, t), ModBlocks.petalBlock, ModBlocks.pool, ModBlocks.spreader); items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, (float) ((ItemManaMirror) ModItems.manaMirror).getMana(s) / (float) TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror); diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index da62e32c6..d98cc042d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -21,8 +21,8 @@ import net.minecraft.item.Item; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; -import net.minecraftforge.fml.common.registry.RegistryDelegate; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.registries.IRegistryDelegate; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.client.model.SpecialFlowerModel; @@ -170,7 +170,7 @@ public final class ModelHandler { } } - private static final Map, IStateMapper> customStateMappers = ReflectionHelper.getPrivateValue(ModelLoader.class, null, "customStateMappers"); + private static final Map, IStateMapper> customStateMappers = ReflectionHelper.getPrivateValue(ModelLoader.class, null, "customStateMappers"); private static final DefaultStateMapper fallbackMapper = new DefaultStateMapper(); private static ModelResourceLocation getMrlForState(IBlockState state) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index ab24be5b4..8b50b511e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -437,7 +437,7 @@ public class GuiLexicon extends GuiScreen { case -2 : // todo 1.12 switch to botania tab if(mc.player != null) - this.mc.displayGuiScreen(new GuiScreenAdvancements(this.mc.player.connection.func_191982_f())); + this.mc.displayGuiScreen(new GuiScreenAdvancements(this.mc.player.connection.getAdvancementManager())); break; case -3 : mc.displayGuiScreen(new GuiLexiconChallengesList()); diff --git a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java index f4eb1902b..84e1ca79f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java @@ -87,7 +87,7 @@ public class LayerGaiaHead implements LayerRenderer { // Botania - use gaia TESR ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); - ((RenderTileGaiaHead) (TileEntitySpecialRenderer) TileEntityRendererDispatcher.instance.getSpecialRendererByClass(TileGaiaHead.class)) + ((RenderTileGaiaHead) (TileEntitySpecialRenderer) TileEntityRendererDispatcher.instance.getRenderer(TileGaiaHead.class)) .renderSkull(-0.5F, 0.0F, -0.5F, EnumFacing.UP, 180.0F, itemstack.getMetadata(), null, -1, limbSwing); ShaderHelper.releaseShader(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java index ee41d9ae2..51dd22041 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -32,7 +32,7 @@ public class RenderPoolMinecart extends RenderMinecart { protected void renderCartContents(EntityPoolMinecart poolCart, float partialTicks, @Nonnull IBlockState state) { RenderTilePool.forceVariant = PoolVariant.DEFAULT; RenderTilePool.forceManaNumber = poolCart.getMana(); - TileEntityRendererDispatcher.instance.getSpecialRendererByClass(TilePool.class).renderTileEntityAt(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1, 0); + TileEntityRendererDispatcher.instance.getRenderer(TilePool.class).render(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1, 0); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index f858e79f0..c5c754afa 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -32,7 +32,7 @@ import vazkii.botania.common.block.tile.TileAlfPortal; public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(@Nonnull TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress, float unused) { + public void render(@Nonnull TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress, float unused) { if (!portal.getWorld().isBlockLoaded(portal.getPos(), false) || portal.getWorld().getBlockState(portal.getPos()).getBlock() != ModBlocks.alfPortal) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index c0704fffa..0d1142aa5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -33,7 +33,7 @@ import vazkii.botania.common.block.tile.TileAltar; public class RenderTileAltar extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(@Nonnull TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress, float unused) { + public void render(@Nonnull TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress, float unused) { if(!altar.getWorld().isBlockLoaded(altar.getPos(), false) || altar.getWorld().getBlockState(altar.getPos()).getBlock() != ModBlocks.altar) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java index d1dd1d1f9..6d48288c3 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java @@ -24,7 +24,7 @@ import vazkii.botania.common.block.tile.TileAnimatedTorch; public class RenderTileAnimatedTorch extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileAnimatedTorch te, double x, double y, double z, float partialTicks, int destroyStage, float unused) { + public void render(TileAnimatedTorch te, double x, double y, double z, float partialTicks, int destroyStage, float unused) { Minecraft mc = Minecraft.getMinecraft(); GlStateManager.pushMatrix(); GlStateManager.translate(x, y, z); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index b2f185ccc..97726171e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -41,7 +41,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { private static final ModelAvatar model = new ModelAvatar(); @Override - public void renderTileEntityAt(@Nullable TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress, float unused) { + public void render(@Nullable TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress, float unused) { if (avatar != null) if (!avatar.getWorld().isBlockLoaded(avatar.getPos(), false) || avatar.getWorld().getBlockState(avatar.getPos()).getBlock() != ModBlocks.avatar) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 4458a7393..1bbefbd06 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -31,7 +31,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { private static final ModelBellows model = new ModelBellows(); @Override - public void renderTileEntityAt(@Nullable TileBellows bellows, double d0, double d1, double d2, float f, int digProgress, float unused) { + public void render(@Nullable TileBellows bellows, double d0, double d1, double d2, float f, int digProgress, float unused) { if (bellows != null) if (!bellows.getWorld().isBlockLoaded(bellows.getPos(), false) || bellows.getWorld().getBlockState(bellows.getPos()).getBlock() != ModBlocks.bellows) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 4031b3d0a..6f46ef96f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -32,7 +32,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { public TileBrewery brewery; @Override - public void renderTileEntityAt(@Nullable TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress, float unused) { + public void render(@Nullable TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress, float unused) { this.brewery = brewery; GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java index 2fa12f0e6..d713e395d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -25,7 +25,7 @@ import vazkii.botania.common.block.tile.TileCocoon; public class RenderTileCocoon extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(@Nonnull TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress, float unused) { + public void render(@Nonnull TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress, float unused) { float rot = 0F; float modval = 60F - (float) cocoon.timePassed / (float) TileCocoon.TOTAL_TIME * 30F; if(cocoon.timePassed % modval < 10) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index f2c1d8a08..00264adb3 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -50,7 +50,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer sprites = new HashMap(); @Override - public void renderTileEntityAt(@Nonnull TileLightRelay tile, double x, double y, double z, float pticks, int digProgress, float unused) { + public void render(@Nonnull TileLightRelay tile, double x, double y, double z, float pticks, int digProgress, float unused) { if(!tile.getWorld().isBlockLoaded(tile.getPos(), false) || tile.getWorld().getBlockState(tile.getPos()).getBlock() != ModBlocks.lightRelay) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index ff46ee8b7..8215d21f9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -44,7 +44,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { public static int forceManaNumber = -1; @Override - public void renderTileEntityAt(@Nonnull TilePool pool, double d0, double d1, double d2, float f, int digProgress, float unused) { + public void render(@Nonnull TilePool pool, double d0, double d1, double d2, float f, int digProgress, float unused) { if(pool != null && (!pool.getWorld().isBlockLoaded(pool.getPos(), false) || pool.getWorld().getBlockState(pool.getPos()).getBlock() != ModBlocks.pool)) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index 735d9c637..5a956da11 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -27,7 +27,7 @@ import vazkii.botania.common.block.tile.mana.TilePrism; public class RenderTilePrism extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(@Nonnull TilePrism prism, double x, double y, double z, float partTicks, int digProgress, float unused) { + public void render(@Nonnull TilePrism prism, double x, double y, double z, float partTicks, int digProgress, float unused) { GlStateManager.pushMatrix(); GlStateManager.translate(x, y, z); float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index 864bc6e77..62b3c7c17 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -46,7 +46,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { public static boolean pink = false; @Override - public void renderTileEntityAt(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress, float unused) { + public void render(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress, float unused) { if(!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || pylon.getWorld().getBlockState(pylon.getPos()).getBlock() != ModBlocks.pylon) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index 7d170b399..56c2293fd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -28,7 +28,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(@Nonnull TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress, float unused) { + public void render(@Nonnull TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress, float unused) { GlStateManager.pushMatrix(); GlStateManager.translate(d0, d1, d2); GlStateManager.rotate(90F, 1F, 0F, 0F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 7f74db2c7..3a7dc41b6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -46,7 +46,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer private static final ModelSpreader model = new ModelSpreader(); @Override - public void renderTileEntityAt(@Nonnull TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress, float unused) { + public void render(@Nonnull TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress, float unused) { if(!spreader.getWorld().isBlockLoaded(spreader.getPos(), false) || spreader.getWorld().getBlockState(spreader.getPos()).getBlock() != ModBlocks.spreader) return; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 13391994c..33b3d709f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -39,7 +39,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(@Nonnull TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress, float unused) { + public void render(@Nonnull TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress, float unused) { float max = TileTerraPlate.MAX_MANA / 10F; float alphaMod = Math.min(max, plate.getCurrentMana()) / max; GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index 70f684da5..dbcc836fc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -33,7 +33,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer implements IRecipe { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java index c0cff73b3..62ae7b113 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java @@ -18,7 +18,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; +import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index fe6abba31..a2ca621ed 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -19,7 +19,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; +import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java index 902e22637..33a2d29b0 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java @@ -19,7 +19,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; +import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ModItems; public class SpellClothRecipe extends IForgeRegistryEntry.Impl implements IRecipe { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java index 8f795eb87..d607a47e3 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java @@ -18,7 +18,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; +import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index ce77b8388..c63631c88 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -128,7 +128,7 @@ public final class ToolCommons { return 0; ItemTool tool = (ItemTool) item; - ToolMaterial material = tool.getToolMaterial(); + ToolMaterial material = ToolMaterial.DIAMOND; // tool.getToolMaterial(); todo 1.12 int materialLevel = 0; if(material == BotaniaAPI.manasteelToolMaterial) materialLevel = 10; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index 307e984bd..1e323c1f5 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -97,8 +97,9 @@ public class ItemDice extends ItemRelic { EntityPlayerMP mpPlayer = (EntityPlayerMP) player; Item item = relicStacks[relic].getItem(); IRelic irelic = (IRelic) item; - Achievement achievement = irelic.getBindAchievement(); - return mpPlayer.getStatFile().hasAchievementUnlocked(achievement); + return false; // todo 1.12 + /*Achievement achievement = irelic.getBindAchievement(); + return mpPlayer.getStatFile().hasAchievementUnlocked(achievement);*/ } } diff --git a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java index d16dd6b4a..906ac1481 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java @@ -10,9 +10,11 @@ */ package vazkii.botania.common.lexicon; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementProgress; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.stats.Achievement; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -20,21 +22,27 @@ import vazkii.botania.api.lexicon.LexiconCategory; public class RelicLexiconEntry extends BasicLexiconEntry { - final Achievement a; + final ResourceLocation a; - public RelicLexiconEntry(String unlocalizedName, LexiconCategory category, Achievement a) { + public RelicLexiconEntry(String unlocalizedName, LexiconCategory category, ResourceLocation advancement) { super(unlocalizedName, category); setKnowledgeType(BotaniaAPI.relicKnowledge); - this.a = a; - if(a != null) - setIcon(a.theItemStack.copy()); + this.a = advancement; + /*if(a != null) todo 1.12 + setIcon(a.theItemStack.copy());*/ } @Override @SideOnly(Side.CLIENT) public boolean isVisible() { EntityPlayerSP player = Minecraft.getMinecraft().player; - return a == null || player.capabilities.isCreativeMode || player.getStatFileWriter().hasAchievementUnlocked(a); + if(a == null || player.capabilities.isCreativeMode) { + return true; + } else { + Advancement a = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(a); + AdvancementProgress progress = player.connection.getAdvancementManager().advancementToProgress.get(a); + return progress.isDone(); + } } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index f312d7265..c9abdc6f2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -10,10 +10,12 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; +import net.minecraft.item.crafting.Ingredient; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; @@ -41,25 +43,29 @@ public class PageCraftingRecipe extends PageRecipe { private static final ResourceLocation craftingOverlay = new ResourceLocation(LibResources.GUI_CRAFTING_OVERLAY); - final List recipes; + final List recipes; int ticksElapsed = 0; int recipeAt = 0; boolean oreDictRecipe, shapelessRecipe; - public PageCraftingRecipe(String unlocalizedName, List recipes) { + public PageCraftingRecipe(String unlocalizedName, List recipes) { super(unlocalizedName); this.recipes = recipes; } - public PageCraftingRecipe(String unlocalizedName, IRecipe recipe) { + public PageCraftingRecipe(String unlocalizedName, ResourceLocation recipe) { this(unlocalizedName, Collections.singletonList(recipe)); } @Override public void onPageAdded(LexiconEntry entry, int index) { - for(IRecipe recipe : recipes) - LexiconRecipeMappings.map(recipe.getRecipeOutput(), entry, index); + for(ResourceLocation name : recipes) { + IRecipe recipe = ForgeRegistries.RECIPES.getValue(name); + if(recipe != null && !recipe.getRecipeOutput().isEmpty()) { + LexiconRecipeMappings.map(recipe.getRecipeOutput(), entry, index); + } + } } @Override @@ -67,7 +73,7 @@ public class PageCraftingRecipe extends PageRecipe { public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { oreDictRecipe = shapelessRecipe = false; - IRecipe recipe = recipes.get(recipeAt); + IRecipe recipe = ForgeRegistries.RECIPES.getValue(recipes.get(recipeAt)); renderCraftingRecipe(gui, recipe); TextureManager render = Minecraft.getMinecraft().renderEngine; @@ -127,7 +133,7 @@ public class PageCraftingRecipe extends PageRecipe { for(int y = 0; y < shaped.recipeHeight; y++) for(int x = 0; x < shaped.recipeWidth; x++) - renderItemAtGridPos(gui, 1 + x, 1 + y, shaped.recipeItems[y * shaped.recipeWidth + x], true); + renderItemAtGridPos(gui, 1 + x, 1 + y, shaped.recipeItems.get(y * shaped.recipeWidth + x).getMatchingStacks()[0], true); } else if(recipe instanceof ShapedOreRecipe) { ShapedOreRecipe shaped = (ShapedOreRecipe) recipe; int width = ReflectionHelper.getPrivateValue(ShapedOreRecipe.class, shaped, 4); @@ -135,9 +141,9 @@ public class PageCraftingRecipe extends PageRecipe { for(int y = 0; y < height; y++) for(int x = 0; x < width; x++) { - Object input = shaped.getInput()[y * width + x]; - if(input != null) - renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((List) input).get(0), true); + Ingredient input = shaped.getIngredients().get(y * width + x); + if(input != Ingredient.EMPTY) + renderItemAtGridPos(gui, 1 + x, 1 + y, input.getMatchingStacks()[0], true); } oreDictRecipe = true; @@ -152,7 +158,7 @@ public class PageCraftingRecipe extends PageRecipe { if(index >= shapeless.recipeItems.size()) break drawGrid; - renderItemAtGridPos(gui, 1 + x, 1 + y, shapeless.recipeItems.get(index), true); + renderItemAtGridPos(gui, 1 + x, 1 + y, shapeless.recipeItems.get(index).getMatchingStacks()[0], true); } } @@ -165,12 +171,12 @@ public class PageCraftingRecipe extends PageRecipe { for(int x = 0; x < 3; x++) { int index = y * 3 + x; - if(index >= shapeless.getRecipeSize()) - break drawGrid; + /*if(index >= shapeless.getRecipeSize()) todo 1.12 + break drawGrid;*/ - Object input = shapeless.getInput().get(index); - if(input != null) - renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((List) input).get(0), true); + Ingredient input = shapeless.getIngredients().get(index); + if(input != Ingredient.EMPTY) + renderItemAtGridPos(gui, 1 + x, 1 + y, input.getMatchingStacks()[0], true); } } @@ -183,10 +189,10 @@ public class PageCraftingRecipe extends PageRecipe { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); - for(IRecipe r : recipes) - list.add(r.getRecipeOutput()); - - return list; + return recipes.stream() + .map(ForgeRegistries.RECIPES::getValue) + .map(IRecipe::getRecipeOutput) + .filter(s -> !s.isEmpty()) + .collect(Collectors.toList()); } }