From e673cc9f0ca5cac77d34ac3171d942cbb09b048d Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Fri, 10 Jul 2015 16:57:25 -0400 Subject: [PATCH] Removed TileCompacter --- .../bloodarsenal/common/block/BlockCompacter.java | 10 +--------- .../arc/bloodarsenal/common/block/ModBlocks.java | 1 - .../common/tileentity/TileCompacter.java | 11 ----------- .../arc/bloodarsenal/common/tinkers/TConEvents.java | 13 +++++++++---- 4 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompacter.java diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java index 08ea116..03ab2ce 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java @@ -12,12 +12,10 @@ import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS; -import com.arc.bloodarsenal.common.tileentity.TileCompacter; import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.effect.EntityLightningBolt; @@ -33,7 +31,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import java.util.List; -public class BlockCompacter extends BlockContainer +public class BlockCompacter extends Block { private String ritualName; private int direction; @@ -268,12 +266,6 @@ public class BlockCompacter extends BlockContainer this.sideIcon = p_149651_1_.registerIcon(this.getTextureName() + "_side"); } - @Override - public TileEntity createNewTileEntity(World world, int meta) - { - return new TileCompacter(); - } - private void checkRitual(TileEntity tileEntity) { TEMasterStone masterStone = (TEMasterStone) tileEntity; diff --git a/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java b/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java index cc93092..22a1549 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java @@ -63,7 +63,6 @@ public class ModBlocks { GameRegistry.registerTileEntity(TilePortableAltar.class, "portable_altar"); GameRegistry.registerTileEntity(TileLifeInfuser.class, "life_infuser"); - GameRegistry.registerTileEntity(TileCompacter.class, "compacter"); GameRegistry.registerTileEntity(TileLPMaterializer.class, "lp_materializer"); GameRegistry.registerTileEntity(TileCompactedMRS.class, "compacted_mrs"); } diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompacter.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompacter.java deleted file mode 100644 index 3acd085..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompacter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.arc.bloodarsenal.common.tileentity; - -import net.minecraft.tileentity.TileEntity; - -public class TileCompacter extends TileEntity -{ - public TileCompacter() - { - - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java index 4141189..fe17426 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java @@ -1,8 +1,13 @@ package com.arc.bloodarsenal.common.tinkers; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.client.event.TextureStitchEvent; + public class TConEvents { -/* @SideOnly(Side.CLIENT) + @SideOnly(Side.CLIENT) @SubscribeEvent public void handleStich(TextureStitchEvent.Pre event) { if (event.map.getTextureType() != 0) { @@ -10,7 +15,7 @@ public class TConEvents } BloodArsenalTinkers.bloodInfusedIron.setIcons(event.map.registerIcon("TConIntegration.bedrock")); - TextureAtlasSprite sprite = new TextureBedrockLava("extrautils:bedrockFluid", "lava_still"); +/* TextureAtlasSprite sprite = new TextureBedrockLava("extrautils:bedrockFluid", "lava_still"); event.map.setTextureEntry("extrautils:bedrockFluid", sprite); if (BloodArsenalTinkers.bloodInfusedIron != null) { BloodArsenalTinkers.bloodInfusedIron.setIcons(sprite); @@ -20,5 +25,5 @@ public class TConEvents (BloodArsenalTinkers.bloodInfusedIron != null)) { BloodArsenalTinkers.bloodInfusedIron.setFlowingIcon(sprite); } - } -*/} +*/ } +}