From ae57ace7e8ff38803a8d3c9d311e9e22b817e2cf Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Apr 2016 21:03:12 -0500 Subject: [PATCH] Fix spreader item model, misc fixes, update forge to 1841 so all interact events are back --- build.properties | 2 +- .../vazkii/botania/api/wiki/WikiHooks.java | 2 +- .../client/core/handler/ModelHandler.java | 24 +++++----- .../core/handler/MultiblockRenderHandler.java | 8 +--- .../block/decor/slabs/BlockModSlab.java | 6 ++- .../string/BlockRedStringInterceptor.java | 6 +-- .../vazkii/botania/common/brew/ModBrews.java | 2 +- .../core/handler/SpawnerChangingHandler.java | 43 ----------------- .../common/core/proxy/CommonProxy.java | 2 - .../botania/common/item/ItemLaputaShard.java | 2 +- .../item/material/ItemManaResource.java | 48 ++++++++----------- .../common/item/relic/ItemLokiRing.java | 19 ++++---- .../common/item/rod/ItemExchangeRod.java | 13 ++--- .../common/world/SkyblockWorldEvents.java | 32 ++++++------- .../assets/botania/blockstates/spreader.json | 7 +-- 15 files changed, 77 insertions(+), 139 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java diff --git a/build.properties b/build.properties index ef8b75489..1ddffd5c0 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat Mar 12 17:00:04 CST 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.16.0.1833-1.9 +forge_version=12.16.0.1841-1.9 mc_version=1.9 dir_repo=./ build_number=300-ALPHA diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index 3d22f4cde..4f1523824 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -24,7 +24,7 @@ public class WikiHooks { private static final Map modWikis = new HashMap<>(); public static IWikiProvider getWikiFor(Block block) { - ResourceLocation mod = GameData.getBlockRegistry().getNameForObject(block); + ResourceLocation mod = Block.blockRegistry.getNameForObject(block); return getWikiFor(mod == null ? "" : mod.getResourceDomain().toLowerCase()); } 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 a240c8775..c0b78ba38 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -685,7 +685,7 @@ public final class ModelHandler { private static void registerMushrooms() { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.mushroom).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.mushroom).toString(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } } @@ -693,26 +693,26 @@ public final class ModelHandler { private static void registerFlowers() { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.flower).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.flower).toString(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } item = Item.getItemFromBlock(ModBlocks.shinyFlower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.shinyFlower).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.shinyFlower).toString(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName())); } item = Item.getItemFromBlock(ModBlocks.doubleFlower1); for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) { - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower1).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.doubleFlower1).toString(); String variant = "inventory_" + color.getName(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, variant)); } item = Item.getItemFromBlock(ModBlocks.doubleFlower2); for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) { - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.doubleFlower2).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.doubleFlower2).toString(); String variant = "inventory_" + color.getName(); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant)); } @@ -720,7 +720,7 @@ public final class ModelHandler { private static void registerPavement() { Item item = Item.getItemFromBlock(ModFluffBlocks.pavement); - String name = GameData.getBlockRegistry().getNameForObject(ModFluffBlocks.pavement).toString(); + String name = Block.blockRegistry.getNameForObject(ModFluffBlocks.pavement).toString(); for (EnumDyeColor e : BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues()) { String variant = "color=" + e.getName(); @@ -870,7 +870,7 @@ public final class ModelHandler { private static void registerAltars() { Item item = Item.getItemFromBlock(ModBlocks.altar); - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.altar).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.altar).toString(); for (int i = 0; i < AltarVariant.values().length - 1; i++) { // Off by one on purpose to exclude MOSSY String variantName = "variant=" + AltarVariant.values()[i].getName(); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, variantName)); @@ -882,7 +882,7 @@ public final class ModelHandler { if (b == null) // Dark quartz disabled continue; Item item = Item.getItemFromBlock(b); - String name = GameData.getBlockRegistry().getNameForObject(b).toString(); + String name = Block.blockRegistry.getNameForObject(b).toString(); ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(name, "variant=normal")); ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(name, "variant=chiseled")); ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation(name, "variant=pillar_y")); @@ -891,7 +891,7 @@ public final class ModelHandler { private static void registerLuminizers() { Item item = Item.getItemFromBlock(ModBlocks.lightRelay); - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.lightRelay).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.lightRelay).toString(); for (LuminizerVariant v : LuminizerVariant.values()) { ModelLoader.setCustomModelResourceLocation(item, v.ordinal(), new ModelResourceLocation(name, "powered=false,variant=" + v.getName())); } @@ -899,7 +899,7 @@ public final class ModelHandler { private static void registerPools() { Item item = Item.getItemFromBlock(ModBlocks.pool); - String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.pool).toString(); + String name = Block.blockRegistry.getNameForObject(ModBlocks.pool).toString(); for (PoolVariant v : PoolVariant.values()) { if (v == PoolVariant.CREATIVE) { // Special case to have mana water layer @@ -913,7 +913,7 @@ public final class ModelHandler { private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { - String baseName = GameData.getBlockRegistry().getNameForObject(b).toString(); + String baseName = Block.blockRegistry.getNameForObject(b).toString(); String variantName = variantHeader + "=" + e.getName(); ModelLoader.setCustomModelResourceLocation(item, e.ordinal(), new ModelResourceLocation(baseName, variantName)); } @@ -923,7 +923,7 @@ public final class ModelHandler { * Registers all metas of the given item to models/item/registryname.json */ private static void registerItemModelAllMeta(Item item, int range) { - String loc = GameData.getItemRegistry().getNameForObject(item).toString(); + String loc = Item.itemRegistry.getNameForObject(item).toString(); for(int i = 0; i < range; i++) { ModelLoader.registerItemVariants(item, new ModelResourceLocation(loc, "inventory")); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(loc, "inventory")); diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 0dfbfe317..30f9dbdc7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -35,12 +35,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; @@ -49,8 +47,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; -import java.util.List; - public final class MultiblockRenderHandler { private static MultiblockBlockAccess blockAccess = new MultiblockBlockAccess(); @@ -115,8 +111,8 @@ public final class MultiblockRenderHandler { } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent event) { - if(currentMultiblock != null && anchor == null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getEntityPlayer() == Minecraft.getMinecraft().thePlayer) { + public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + if(currentMultiblock != null && anchor == null && event.getEntityPlayer() == Minecraft.getMinecraft().thePlayer) { anchor = event.getPos(); angle = event.getEntityPlayer().getHorizontalFacing(); event.setCanceled(true); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 3b0c317d0..fc7d93abd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -12,6 +12,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.RayTraceResult; @@ -22,6 +23,7 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public abstract class BlockModSlab extends BlockSlab implements ILexiconable { @@ -89,7 +91,9 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } public void register() { - GameRegistry.registerBlock(this, isDouble() ? null : ItemBlockModSlab.class, name); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + if (!isDouble()) + GameRegistry.register(new ItemBlockModSlab(this), new ResourceLocation(LibMisc.MOD_ID, name)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 57eea369b..0bd09610f 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -21,7 +21,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; @@ -61,9 +60,8 @@ public class BlockRedStringInterceptor extends BlockRedString { } @SubscribeEvent - public void onInteract(PlayerInteractEvent event) { - if(event.getAction() == Action.RIGHT_CLICK_BLOCK) - TileRedStringInterceptor.onInteract(event.getEntityPlayer(), event.getWorld(), event.getPos(), EnumHand.MAIN_HAND); // todo 1.9 + public void onInteract(PlayerInteractEvent.RightClickBlock event) { + TileRedStringInterceptor.onInteract(event.getEntityPlayer(), event.getWorld(), event.getPos(), event.getHand()); } @Override diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index d0b3e803a..531325ef0 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -69,7 +69,7 @@ public class ModBrews { } public static void initTC() { - Potion warpWardPotion = GameData.getPotionRegistry().getObject(new ResourceLocation("minecraft:warp_ward")); + Potion warpWardPotion = Potion.potionRegistry.getObject(new ResourceLocation("minecraft:warp_ward")); // thaumcraft 5 is registering its potions under the Minecraft namespace if(warpWardPotion != null) diff --git a/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java deleted file mode 100644 index 13933902c..000000000 --- a/src/main/java/vazkii/botania/common/core/handler/SpawnerChangingHandler.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jul 30, 2014, 12:37:24 PM (GMT)] - */ -package vazkii.botania.common.core.handler; - -import net.minecraft.entity.EntityList; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityMobSpawner; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -public final class SpawnerChangingHandler { - - @SubscribeEvent - public void onInteract(PlayerInteractEvent event) { - /*if(event.entityPlayer == null || event.entityPlayer.capabilities == null || event.world == null) todo 1.9 - return; // Cauldron breaks stuff - - if(event.entityPlayer.capabilities.isCreativeMode && !event.world.isRemote && event.action == Action.RIGHT_CLICK_BLOCK && !event.entityPlayer.isSneaking()) { - ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); - if(stack != null && stack.getItem() == Items.spawn_egg) { - TileEntity tile = event.world.getTileEntity(event.pos); - if(tile instanceof TileEntityMobSpawner) { - TileEntityMobSpawner spawner = (TileEntityMobSpawner) tile; - spawner.getSpawnerBaseLogic().setEntityName(EntityList.getStringFromID(stack.getItemDamage())); - event.world.markBlockForUpdate(event.pos); - event.setCanceled(true); - } - } - }*/ - } - -} diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index f72954d77..4e62edf08 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -55,7 +55,6 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.handler.PixieHandler; import vazkii.botania.common.core.handler.SheddingHandler; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.core.handler.SpawnerChangingHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.crafting.ModBrewRecipes; import vazkii.botania.common.crafting.ModCraftingRecipes; @@ -137,7 +136,6 @@ public class CommonProxy { MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance); MinecraftForge.EVENT_BUS.register(new PixieHandler()); MinecraftForge.EVENT_BUS.register(new SheddingHandler()); - MinecraftForge.EVENT_BUS.register(new SpawnerChangingHandler()); MinecraftForge.EVENT_BUS.register(new SubTileNarslimmus.SpawnIntercepter()); MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index ddd30b2c4..97405017c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -137,7 +137,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet world.playAuxSFX(2001, pos_, Block.getStateId(state)); ItemStack copyLens = new ItemStack(this, 1, lens.getItemDamage()); - ItemNBTHelper.setString(copyLens, TAG_BLOCK_NAME, GameData.getBlockRegistry().getNameForObject(block).toString()); + ItemNBTHelper.setString(copyLens, TAG_BLOCK_NAME, Block.blockRegistry.getNameForObject(block).toString()); ItemNBTHelper.setInt(copyLens, TAG_META, block.getMetaFromState(state)); NBTTagCompound cmp = new NBTTagCompound(); if(tile != null) diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 193523236..5d3e1c78b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -28,11 +28,9 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.IFlowerComponent; @@ -43,7 +41,6 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; -import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; @@ -60,35 +57,32 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent event) { - /*boolean rightEvent = event.action == Action.RIGHT_CLICK_AIR; todo 1.9 - ItemStack stack = event.entityPlayer.getCurrentEquippedItem(); + public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + ItemStack stack = event.getItemStack(); boolean correctStack = stack != null && stack.getItem() == Items.glass_bottle; - boolean ender = event.world.provider.getDimension() == 1; + boolean ender = event.getWorld().provider.getDimension() == 1; - if(rightEvent && correctStack && ender) { - RayTraceResult pos = ToolCommons.raytraceFromEntity(event.world, event.entityPlayer, false, 5F); - if(pos == null) { - if (event.entityPlayer.worldObj.isRemote) { - event.entityPlayer.swingItem(); + if(correctStack && ender) { + if (event.getWorld().isRemote) { + event.getEntityPlayer().swingArm(event.getHand()); + } else { + ItemStack stack1 = new ItemStack(this, 1, 15); + event.getEntityPlayer().addStat(ModAchievements.enderAirMake, 1); + + if(!event.getEntityPlayer().inventory.addItemStackToInventory(stack1)) { + event.getEntityPlayer().dropPlayerItemWithRandomChoice(stack1, true); } else { - ItemStack stack1 = new ItemStack(this, 1, 15); - event.entityPlayer.addStat(ModAchievements.enderAirMake, 1); - - if(!event.entityPlayer.inventory.addItemStackToInventory(stack1)) { - event.entityPlayer.dropPlayerItemWithRandomChoice(stack1, true); - } else { - event.entityPlayer.openContainer.detectAndSendChanges(); - } - - stack.stackSize--; - if(stack.stackSize == 0) - event.entityPlayer.inventory.setInventorySlotContents(event.entityPlayer.inventory.currentItem, null); - - event.world.playSound(null, event.pos, SoundEvents.entity_item_pickup, SoundCategory.PLAYERS, 0.5F, 1F); + event.getEntityPlayer().openContainer.detectAndSendChanges(); } + + stack.stackSize--; + if(stack.stackSize == 0) + event.getEntityPlayer().inventory.setInventorySlotContents(event.getEntityPlayer().inventory.currentItem, null); + + event.getWorld().playSound(null, event.getPos(), SoundEvents.entity_item_pickup, SoundCategory.PLAYERS, 0.5F, 1F); + event.setCanceled(true); } - }*/ + } } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 363ad190d..44387d9b7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -13,6 +13,8 @@ package vazkii.botania.common.item.relic; import java.util.ArrayList; import java.util.List; +import baubles.common.network.PacketHandler; +import baubles.common.network.PacketSyncBauble; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -33,7 +35,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.api.mana.IManaUsingItem; @@ -45,8 +46,6 @@ import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketHandler; -import baubles.common.network.PacketSyncBauble; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -69,8 +68,8 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent event) { - /*EntityPlayer player = event.entityPlayer; todo 1.9 + public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + EntityPlayer player = event.getEntityPlayer(); ItemStack lokiRing = getLokiRing(player); if(lokiRing == null || player.worldObj.isRemote) return; @@ -85,7 +84,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } } - ItemStack heldItemStack = player.getCurrentEquippedItem(); + ItemStack heldItemStack = event.getItemStack(); BlockPos originCoords = getOriginPos(lokiRing); RayTraceResult lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10F); List cursors = getCursorList(lokiRing); @@ -93,7 +92,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC int cost = Math.min(cursorCount, (int) Math.pow(Math.E, cursorCount * 0.25)); - if(heldItemStack == null && event.action == Action.RIGHT_CLICK_BLOCK && player.isSneaking()) { + if(heldItemStack == null && player.isSneaking()) { if(originCoords.getY() == -1 && lookPos != null && lookPos.getBlockPos() != null) { setOriginPos(lokiRing, lookPos.getBlockPos()); setCursorList(lokiRing, null); @@ -123,19 +122,19 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } } } - } else if(heldItemStack != null && event.action == Action.RIGHT_CLICK_BLOCK && lookPos != null && lookPos.getBlockPos() != null && player.isSneaking()) { + } else if(heldItemStack != null && lookPos != null && lookPos.getBlockPos() != null && player.isSneaking()) { for(BlockPos cursor : cursors) { BlockPos pos = lookPos.getBlockPos().add(cursor); Item item = heldItemStack.getItem(); if(!player.worldObj.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { - item.onItemUse(player.capabilities.isCreativeMode ? heldItemStack.copy() : heldItemStack, player, player.worldObj, pos, lookPos.sideHit, (float) lookPos.hitVec.xCoord - pos.getX(), (float) lookPos.hitVec.yCoord - pos.getY(), (float) lookPos.hitVec.zCoord - pos.getZ()); + item.onItemUse(player.capabilities.isCreativeMode ? heldItemStack.copy() : heldItemStack, player, player.worldObj, pos, event.getHand(), lookPos.sideHit, (float) lookPos.hitVec.xCoord - pos.getX(), (float) lookPos.hitVec.yCoord - pos.getY(), (float) lookPos.hitVec.zCoord - pos.getZ()); if(heldItemStack.stackSize == 0) { event.setCanceled(true); return; } } } - }*/ + } } public static void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 49cddcfe3..4f9c2c25f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -35,7 +35,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.item.IManaProficiencyArmor; @@ -108,13 +107,11 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } @SubscribeEvent - public void onLeftClick(PlayerInteractEvent event) { - if(event.getAction() == Action.LEFT_CLICK_BLOCK) { - ItemStack stack = event.getEntityPlayer().getHeldItemMainhand(); - if(stack != null && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, false)) { - if(exchange(event.getWorld(), event.getEntityPlayer(), event.getPos(), stack, getBlock(stack).getStateFromMeta(getBlockMeta(stack)))) - ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, true); - } + public void onLeftClick(PlayerInteractEvent.LeftClickBlock event) { + ItemStack stack = event.getItemStack(); + if(stack != null && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, false)) { + if(exchange(event.getWorld(), event.getEntityPlayer(), event.getPos(), stack, getBlock(stack).getStateFromMeta(getBlockMeta(stack)))) + ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, true); } } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 7b830be89..3dcd23805 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -20,18 +20,18 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.event.world.BlockEvent; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.equipment.tool.ToolCommons; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.item.equipment.tool.ToolCommons; public final class SkyblockWorldEvents { @@ -65,35 +65,35 @@ public final class SkyblockWorldEvents { } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent event) { - /*if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld())) { todo 1.9 - ItemStack equipped = event.entityPlayer.getCurrentEquippedItem(); - if(event.action == Action.RIGHT_CLICK_BLOCK && equipped == null && event.entityPlayer.isSneaking()) { - Block block = event.getWorld().getBlockState(event.pos).getBlock(); + public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld())) { + ItemStack equipped = event.getItemStack(); + if(equipped == null && event.getEntityPlayer().isSneaking()) { + Block block = event.getWorld().getBlockState(event.getPos()).getBlock(); if(block == Blocks.grass || block == Blocks.dirt) { if(event.getWorld().isRemote) - event.entityPlayer.swingItem(); + event.getEntityPlayer().swingArm(event.getHand()); else { - event.getWorld().playSoundEffect(event.pos.getX() + 0.5, event.pos.getY() + 0.5, event.pos.getZ() + 0.5, block.stepSound.getBreakSound(), block.stepSound.getVolume() * 0.4F, block.stepSound.getFrequency() + (float) (Math.random() * 0.2 - 0.1)); + event.getWorld().playSound(null, event.getPos(), block.getSoundType().getBreakSound(), SoundCategory.BLOCKS, block.getSoundType().getVolume() * 0.4F, block.getSoundType().getPitch() + (float) (Math.random() * 0.2 - 0.1)); if(Math.random() < 0.8) - event.entityPlayer.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.manaResource, 1, 21), false); + event.getEntityPlayer().dropPlayerItemWithRandomChoice(new ItemStack(ModItems.manaResource, 1, 21), false); } } - } else if(equipped != null && equipped.getItem() == Items.bowl && event.action == Action.RIGHT_CLICK_BLOCK && !event.getWorld().isRemote) { - RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.getWorld(), event.entityPlayer, true, 4.5F); + } else if(equipped != null && equipped.getItem() == Items.bowl && !event.getWorld().isRemote) { + RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.getWorld(), event.getEntityPlayer(), true, 4.5F); if(RayTraceResult != null) { if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { - if(event.getWorld().getBlockState(RayTraceResult.getBlockPos()).getBlock().getMaterial() == Material.water) { + if(event.getWorld().getBlockState(RayTraceResult.getBlockPos()).getMaterial() == Material.water) { --equipped.stackSize; if(equipped.stackSize <= 0) - event.entityPlayer.inventory.setInventorySlotContents(event.entityPlayer.inventory.currentItem, new ItemStack(ModItems.waterBowl)); - else event.entityPlayer.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.waterBowl), false); + event.getEntityPlayer().inventory.setInventorySlotContents(event.getEntityPlayer().inventory.currentItem, new ItemStack(ModItems.waterBowl)); + else event.getEntityPlayer().dropPlayerItemWithRandomChoice(new ItemStack(ModItems.waterBowl), false); } } } } - }*/ + } } @SubscribeEvent diff --git a/src/main/resources/assets/botania/blockstates/spreader.json b/src/main/resources/assets/botania/blockstates/spreader.json index f8564bf6e..a5efbf935 100644 --- a/src/main/resources/assets/botania/blockstates/spreader.json +++ b/src/main/resources/assets/botania/blockstates/spreader.json @@ -2,12 +2,7 @@ "forge_marker": 1, "defaults": { "model": "botania:spreader", - "transform": { - "thirdperson": { - "translation": [ 0, 0.09375, -0.171875], - "rotation": [{"x": 10}, {"y": -45}, {"z": 170}] - } - } + "transform": "forge:default-block" }, "variants": { "variant": {