From a122df19a6fec2f478d772fc2151d76125c41097 Mon Sep 17 00:00:00 2001 From: chylex Date: Sun, 8 Feb 2015 00:41:17 +0100 Subject: [PATCH] Actually removed those two things now... --- build.gradle | 2 +- src/main/java/chylex/hee/block/BlockList.java | 1 - .../java/chylex/hee/entity/fx/EntitySoulCharmFX.java | 7 ++----- src/main/java/chylex/hee/item/ItemList.java | 1 - .../mechanics/enhancements/EnhancementHandler.java | 2 -- src/main/java/chylex/hee/proxy/FXClientProxy.java | 11 ----------- src/main/java/chylex/hee/proxy/FXCommonProxy.java | 2 -- src/main/java/chylex/hee/render/OverlayManager.java | 6 +----- .../integration/handlers/ThaumcraftIntegration.java | 2 +- 9 files changed, 5 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index 78472593..fb421796 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 minecraft { - version = "1.8-11.14.0.1289-1.8" + version = "1.8-11.14.1.1306" runDir = "eclipse" mappings = "snapshot_20150118" } diff --git a/src/main/java/chylex/hee/block/BlockList.java b/src/main/java/chylex/hee/block/BlockList.java index 86817df2..edbd5d9d 100644 --- a/src/main/java/chylex/hee/block/BlockList.java +++ b/src/main/java/chylex/hee/block/BlockList.java @@ -111,7 +111,6 @@ public final class BlockList{ public static Block energy_cluster; public static BlockAbstractState corrupted_energy_high; public static BlockAbstractState corrupted_energy_low; - public static Block soul_charm; public static Block laboratory_glass; // TECHNICAL diff --git a/src/main/java/chylex/hee/entity/fx/EntitySoulCharmFX.java b/src/main/java/chylex/hee/entity/fx/EntitySoulCharmFX.java index 08ec3d11..b6c5cebd 100644 --- a/src/main/java/chylex/hee/entity/fx/EntitySoulCharmFX.java +++ b/src/main/java/chylex/hee/entity/fx/EntitySoulCharmFX.java @@ -13,12 +13,11 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; -import chylex.hee.block.BlockList; import chylex.hee.system.util.BlockPosM; import chylex.hee.system.util.MathUtil; @SideOnly(Side.CLIENT) -public class EntitySoulCharmFX extends EntityFX{ +public abstract class EntitySoulCharmFX extends EntityFX{ private static final ResourceLocation tex = new ResourceLocation("hardcoreenderexpansion:textures/particles/soul_charm.png"); private double targetX, targetY, targetZ; @@ -93,9 +92,7 @@ public class EntitySoulCharmFX extends EntityFX{ else if (motionY != 0D)posY += motionY *= 0.98D; } - protected Block getTargetBlock(){ - return BlockList.soul_charm; - } + protected abstract Block getTargetBlock(); // TODO @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/chylex/hee/item/ItemList.java b/src/main/java/chylex/hee/item/ItemList.java index f0888adc..6133ad51 100644 --- a/src/main/java/chylex/hee/item/ItemList.java +++ b/src/main/java/chylex/hee/item/ItemList.java @@ -71,7 +71,6 @@ public final class ItemList{ public static Item curse; public static Item potion_of_purity; public static Item curse_amulet; - public static Item corporeal_mirage_orb; public static Item charm_pouch; public static Item charm; public static Item scorching_pickaxe; diff --git a/src/main/java/chylex/hee/mechanics/enhancements/EnhancementHandler.java b/src/main/java/chylex/hee/mechanics/enhancements/EnhancementHandler.java index 1b742abd..c82e8f5d 100644 --- a/src/main/java/chylex/hee/mechanics/enhancements/EnhancementHandler.java +++ b/src/main/java/chylex/hee/mechanics/enhancements/EnhancementHandler.java @@ -49,8 +49,6 @@ public final class EnhancementHandler{ Item.getItemFromBlock(BlockList.enhanced_tnt), new EnhancementData(TNTEnhancements.class, Item.getItemFromBlock(BlockList.enhanced_tnt), p, p, i, i, p, p) ); - - //itemMap.put(Item.getItemFromBlock(BlockList.soul_charm), new EnhancementData(SoulCharmEnhancements.class)); } public static boolean canEnhanceItem(Item item){ diff --git a/src/main/java/chylex/hee/proxy/FXClientProxy.java b/src/main/java/chylex/hee/proxy/FXClientProxy.java index f83a83fd..2696a3bf 100644 --- a/src/main/java/chylex/hee/proxy/FXClientProxy.java +++ b/src/main/java/chylex/hee/proxy/FXClientProxy.java @@ -22,7 +22,6 @@ import chylex.hee.entity.fx.EntityCustomBubbleFX; import chylex.hee.entity.fx.EntityEnderGooFX; import chylex.hee.entity.fx.EntityEnergyClusterFX; import chylex.hee.entity.fx.EntityOrbitingPortalFX; -import chylex.hee.entity.fx.EntitySoulCharmFX; import chylex.hee.entity.fx.behavior.ParticleBehaviorMoveTo; import chylex.hee.entity.item.EntityItemAltar; import chylex.hee.entity.item.EntityItemIgneousRock; @@ -192,11 +191,6 @@ public class FXClientProxy extends FXCommonProxy{ spawn(new EntityAltarOrbFX(world,startX,startY,startZ,targetX,targetY,targetZ,essence)); } - @Override - public void soulCharm(World world, int x, int y, int z){ - spawn(new EntitySoulCharmFX(world,x+0.25D+world.rand.nextDouble()*0.5D,y+0.1D+world.rand.nextDouble(),z+0.25D+world.rand.nextDouble()*0.5D)); - } - @Override public void energyCluster(TileEntityEnergyCluster cluster){ Random rand = cluster.getWorld().rand; @@ -208,11 +202,6 @@ public class FXClientProxy extends FXCommonProxy{ public void energyClusterMoving(World world, double x, double y, double z, double motionX, double motionY, double motionZ, double red, double green, double blue){ spawn(new EntityEnergyClusterFX(world,x,y,z,red,green,blue,motionX,motionY,motionZ)); } - - @Override - public void soulCharmMoving(World world, double startX, double startY, double startZ, double targetX, double targetY, double targetZ){ - spawn(new EntitySoulCharmFX(world,startX,startY,startZ,targetX,targetY,targetZ)); - } /* * ENTITIES diff --git a/src/main/java/chylex/hee/proxy/FXCommonProxy.java b/src/main/java/chylex/hee/proxy/FXCommonProxy.java index e3b6ed13..706a2a77 100644 --- a/src/main/java/chylex/hee/proxy/FXCommonProxy.java +++ b/src/main/java/chylex/hee/proxy/FXCommonProxy.java @@ -33,8 +33,6 @@ public class FXCommonProxy{ public void corruptedEnergy(World world, int x, int y, int z){} public void enderGoo(World world, int x, int y, int z){} public void altarOrb(World world, double startX, double startY, double startZ, double targetX, double targetY, double targetZ, EssenceType essence){} - public void soulCharm(World world, int x, int y, int z){} - public void soulCharmMoving(World world, double startX, double startY, double startZ, double targetX, double targetY, double targetZ){} public void energyCluster(TileEntityEnergyCluster cluster){} public void energyClusterMoving(World world, double x, double y, double z, double motionX, double motionY, double motionZ, double red, double green, double blue){} diff --git a/src/main/java/chylex/hee/render/OverlayManager.java b/src/main/java/chylex/hee/render/OverlayManager.java index de5f2b47..a763e5f2 100644 --- a/src/main/java/chylex/hee/render/OverlayManager.java +++ b/src/main/java/chylex/hee/render/OverlayManager.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Set; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; @@ -212,10 +211,7 @@ public class OverlayManager{ @SubscribeEvent public void onRenderBlockOutline(DrawBlockHighlightEvent e){ - Block block = e.player.worldObj.getBlockState(e.target.getBlockPos()).getBlock(); - - if (block == BlockList.soul_charm)e.setCanceled(true); - else if (block == BlockList.energy_cluster){ + if (e.player.worldObj.getBlockState(e.target.getBlockPos()).getBlock() == BlockList.energy_cluster){ clusterLookedAt = (TileEntityEnergyCluster)e.player.worldObj.getTileEntity(e.target.getBlockPos()); e.setCanceled(true); } diff --git a/src/main/java/chylex/hee/system/integration/handlers/ThaumcraftIntegration.java b/src/main/java/chylex/hee/system/integration/handlers/ThaumcraftIntegration.java index 27da4ea0..306e855c 100644 --- a/src/main/java/chylex/hee/system/integration/handlers/ThaumcraftIntegration.java +++ b/src/main/java/chylex/hee/system/integration/handlers/ThaumcraftIntegration.java @@ -14,7 +14,7 @@ public class ThaumcraftIntegration implements IIntegrationHandler{ } @Override - public void integrate(){ + public void integrate(){ // TODO update from 1.7.10 // BLOCK ASPECTS