From b2c013e8c6ce21bdfea7a061a2aa6edddaef21ff Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 20 Jul 2015 20:56:46 -0400 Subject: [PATCH 1/2] Disabled arm rendering for 1.3.3-11 --- .../client/ClientEventHandler.java | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java index b99319df..71e6d416 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java @@ -1,11 +1,9 @@ package WayofTime.alchemicalWizardry.client; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderBlockOverlayEvent; -import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.client.event.sound.SoundEvent; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; @@ -16,8 +14,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ClientEventHandler { @@ -25,18 +21,18 @@ public class ClientEventHandler public static ResourceLocation currentPlayerTexture = null; - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void renderPOVArmour(RenderHandEvent event) - { - if (this.mc.thePlayer.worldObj.isRemote && this.mc.gameSettings.thirdPersonView == 0 && !this.mc.renderViewEntity.isPlayerSleeping() && !this.mc.gameSettings.hideGUI && !this.mc.playerController.enableEverythingIsScrewedUpMode()) - { - currentPlayerTexture = ((AbstractClientPlayer) mc.thePlayer).getLocationSkin(); - - ClientUtils.renderPlayerArmourInPOV(mc.thePlayer, event.partialTicks); - event.setCanceled(true); - } - } +// @SideOnly(Side.CLIENT) +// @SubscribeEvent +// public void renderPOVArmour(RenderHandEvent event) +// { +// if (this.mc.thePlayer.worldObj.isRemote && this.mc.gameSettings.thirdPersonView == 0 && !this.mc.renderViewEntity.isPlayerSleeping() && !this.mc.gameSettings.hideGUI && !this.mc.playerController.enableEverythingIsScrewedUpMode()) +// { +// currentPlayerTexture = ((AbstractClientPlayer) mc.thePlayer).getLocationSkin(); +// +// ClientUtils.renderPlayerArmourInPOV(mc.thePlayer, event.partialTicks); +// event.setCanceled(true); +// } +// } // @SubscribeEvent(priority = EventPriority.LOWEST) // public void onPlayerRenderTick(RenderPlayerEvent.Pre event) From 79f86a3a37cd1273343a4dfd3fd8929ceac0800e Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 23 Jul 2015 09:23:38 -0400 Subject: [PATCH 2/2] Fixed the Dynamic Mace so that it looks at the material of the block as well. --- build.properties | 4 +-- .../api/items/ItemSpellMultiTool.java | 27 +++++++++++++++++- .../client/ClientEventHandler.java | 28 +++++++++++-------- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/build.properties b/build.properties index 8a8cd00a..2498a91e 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Sun Jul 19 14:39:17 EDT 2015 +#Mon Jul 20 20:59:46 EDT 2015 mod_name=BloodMagic forge_version=10.13.4.1448-1.7.10 ccc_version=1.0.4.29 @@ -9,5 +9,5 @@ guideapi_version=1.0.1-20 package_group=com.wayoftime.bloodmagic mod_version=1.3.3 minetweaker_version=Dev-1.7.10-3.0.9B +build_number=12 mc_version=1.7.10 -build_number=11 diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/ItemSpellMultiTool.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/ItemSpellMultiTool.java index c9335a0d..2d7325ca 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/ItemSpellMultiTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/ItemSpellMultiTool.java @@ -285,7 +285,12 @@ public class ItemSpellMultiTool extends Item if (toolClass == null || toolClass.equals("")) { - return 1.0f; + toolClass = getToolClassOfMaterial(block.getMaterial()); + + if(toolClass == "") + { + return 1.0f; + } } { if (stack.hasTagCompound()) @@ -301,6 +306,26 @@ public class ItemSpellMultiTool extends Item return 1.0f; } + + public String getToolClassOfMaterial(Material mat) + { + if(mat == Material.iron || mat == Material.anvil || mat == Material.rock) + { + return "pickaxe"; + } + + if(mat == Material.wood || mat == Material.plants || mat == Material.vine) + { + return "axe"; + } + + if(mat == Material.ground || mat == Material.grass) + { + return "shovel"; + } + + return ""; + } @Override public int getHarvestLevel(ItemStack stack, String toolClass) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java index 71e6d416..b99319df 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientEventHandler.java @@ -1,9 +1,11 @@ package WayofTime.alchemicalWizardry.client; import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderBlockOverlayEvent; +import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.client.event.sound.SoundEvent; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; @@ -14,6 +16,8 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ClientEventHandler { @@ -21,18 +25,18 @@ public class ClientEventHandler public static ResourceLocation currentPlayerTexture = null; -// @SideOnly(Side.CLIENT) -// @SubscribeEvent -// public void renderPOVArmour(RenderHandEvent event) -// { -// if (this.mc.thePlayer.worldObj.isRemote && this.mc.gameSettings.thirdPersonView == 0 && !this.mc.renderViewEntity.isPlayerSleeping() && !this.mc.gameSettings.hideGUI && !this.mc.playerController.enableEverythingIsScrewedUpMode()) -// { -// currentPlayerTexture = ((AbstractClientPlayer) mc.thePlayer).getLocationSkin(); -// -// ClientUtils.renderPlayerArmourInPOV(mc.thePlayer, event.partialTicks); -// event.setCanceled(true); -// } -// } + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void renderPOVArmour(RenderHandEvent event) + { + if (this.mc.thePlayer.worldObj.isRemote && this.mc.gameSettings.thirdPersonView == 0 && !this.mc.renderViewEntity.isPlayerSleeping() && !this.mc.gameSettings.hideGUI && !this.mc.playerController.enableEverythingIsScrewedUpMode()) + { + currentPlayerTexture = ((AbstractClientPlayer) mc.thePlayer).getLocationSkin(); + + ClientUtils.renderPlayerArmourInPOV(mc.thePlayer, event.partialTicks); + event.setCanceled(true); + } + } // @SubscribeEvent(priority = EventPriority.LOWEST) // public void onPlayerRenderTick(RenderPlayerEvent.Pre event)