From acfa518f62f93d3896e6aab2bd1c52af0f8eef6d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 25 Jun 2017 00:25:15 -0500 Subject: [PATCH] Other non-recipe misc fixes --- .../vazkii/botania/api/internal/DummyMethodHandler.java | 5 ++--- .../botania/api/internal/IInternalMethodHandler.java | 5 ++--- src/main/java/vazkii/botania/common/Botania.java | 6 ------ .../java/vazkii/botania/common/block/BlockFakeAir.java | 3 --- .../botania/common/core/handler/InternalMethodHandler.java | 5 ++--- .../botania/common/crafting/ModMigrationRecipes.java | 2 +- .../common/item/equipment/bauble/ItemFlightTiara.java | 2 +- .../common/item/equipment/bauble/ItemTravelBelt.java | 2 +- .../vazkii/botania/common/lexicon/RelicLexiconEntry.java | 7 ++++--- 9 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 5bc4d9612..3594f3afc 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -20,7 +20,6 @@ import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; @@ -56,12 +55,12 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public LexiconPage craftingRecipesPage(String key, List recipes) { + public LexiconPage craftingRecipesPage(String key, List recipes) { return dummyPage(key); } @Override - public LexiconPage craftingRecipePage(String key, IRecipe recipe) { + public LexiconPage craftingRecipePage(String key, ResourceLocation recipe) { return dummyPage(key); } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 71e36b7d8..52b7ead58 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -19,7 +19,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; @@ -54,9 +53,9 @@ public interface IInternalMethodHandler { public LexiconPage imagePage(String key, String resource); - public LexiconPage craftingRecipesPage(String key, List recipes); + public LexiconPage craftingRecipesPage(String key, List recipes); - public LexiconPage craftingRecipePage(String key, IRecipe recipe); + public LexiconPage craftingRecipePage(String key, ResourceLocation recipe); public LexiconPage petalRecipesPage(String key, List recipes); diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index fbcf0e5f2..9ac87ec64 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -126,11 +126,7 @@ public class Botania { ConfigHandler.loadConfig(event.getSuggestedConfigurationFile()); PacketHandler.init(); - ModSounds.init(); - ModBlocks.init(); - ModItems.init(); ModEntities.init(); - ModPotions.init(); ModBrews.init(); ModMultiblocks.init(); @@ -144,8 +140,6 @@ public class Botania { @EventHandler public void init(FMLInitializationEvent event) { - ModCraftingRecipes.init(); - ModMigrationRecipes.init(); ModPetalRecipes.init(); ModPureDaisyRecipes.init(); ModRuneRecipes.init(); diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 328038bdb..a7ec9f090 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -54,9 +54,6 @@ public class BlockFakeAir extends BlockMod { return EnumBlockRenderType.INVISIBLE; } - @Override - public void registerItemForm() {} - @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { if(shouldRemove(world, pos)) diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index aa47166dc..3de3bb5c8 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -25,7 +25,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; @@ -93,12 +92,12 @@ public class InternalMethodHandler extends DummyMethodHandler { } @Override - public LexiconPage craftingRecipesPage(String key, List recipes) { + public LexiconPage craftingRecipesPage(String key, List recipes) { return new PageCraftingRecipe(key, recipes); } @Override - public LexiconPage craftingRecipePage(String key, IRecipe recipe) { + public LexiconPage craftingRecipePage(String key, ResourceLocation recipe) { return new PageCraftingRecipe(key, recipe); } diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index 6f20ecac8..a3f180a20 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -12,7 +12,7 @@ public final class ModMigrationRecipes { public static void init() { // Prismarine -> vanilla - GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10)); + // todo 1.12 json GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10)); } private ModMigrationRecipes() {} diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 805d6304a..1e50fd870 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -149,7 +149,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, maxCd); } else if(cooldown > 0) { if(maxCd - cooldown < 2) - player.func_191958_b(0F, 0F, 1F, 5F); // todo 1.12 recheck + player.moveRelative(0F, 0F, 1F, 5F); else if(maxCd - cooldown < 10) player.setSprinting(false); ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, cooldown - 2); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 4a7554c23..9c3666166 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -81,7 +81,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs if(player.world.isRemote) { if((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F && !player.isInsideOfMaterial(Material.WATER)) { float speed = beltItem.getSpeed(belt); - player.func_191958_b(0F, 0F, 1F, player.capabilities.isFlying ? speed : speed); // todo 1.12 verify + player.moveRelative(0F, 0F, 1F, player.capabilities.isFlying ? speed : speed); beltItem.onMovedTick(belt, player); if(player.ticksExisted % COST_INTERVAL == 0) diff --git a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java index 906ac1481..a3d1c8c8b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java @@ -39,9 +39,10 @@ public class RelicLexiconEntry extends BasicLexiconEntry { 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(); + /*Advancement adv = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(a); + AdvancementProgress progress = player.connection.getAdvancementManager().advancementToProgress.get(adv); + return progress.isDone();*/ + return false; // todo 1.12 } }