From 63d7a763186dbcf0547392d88a81692f7e50ff07 Mon Sep 17 00:00:00 2001 From: Fenn Date: Sat, 31 May 2014 20:29:35 +0100 Subject: [PATCH] Metal/Gem blocks can be used for beacon bases, suggestion from GregoriousT :P --- .../info/jbcs/minecraft/chisel/Chisel.java | 44 +++++++++---------- .../jbcs/minecraft/chisel/ChiselBlocks.java | 33 +++----------- .../chisel/block/BlockBeaconBase.java | 16 +++++++ 3 files changed, 42 insertions(+), 51 deletions(-) create mode 100644 src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index ea49b3a9..7910ed49 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -1,40 +1,39 @@ package info.jbcs.minecraft.chisel; -import info.jbcs.minecraft.chisel.carving.Carving; -import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; -import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; -import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; -import info.jbcs.minecraft.chisel.inventory.ContainerChisel; -import info.jbcs.minecraft.chisel.client.gui.GuiChisel; -import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection; -import info.jbcs.minecraft.chisel.item.ItemBallOMoss; -import info.jbcs.minecraft.chisel.item.ItemChisel; -import info.jbcs.minecraft.chisel.item.ItemCloudInABottle; - -import java.io.File; - -import info.jbcs.minecraft.chisel.item.ItemSmashingRock; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.world.World; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLMissingMappingsEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLMissingMappingsEvent.Action; import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.Type; +import info.jbcs.minecraft.chisel.carving.Carving; +import info.jbcs.minecraft.chisel.client.gui.GuiChisel; +import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; +import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; +import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; +import info.jbcs.minecraft.chisel.inventory.ContainerChisel; +import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection; +import info.jbcs.minecraft.chisel.item.ItemBallOMoss; +import info.jbcs.minecraft.chisel.item.ItemChisel; +import info.jbcs.minecraft.chisel.item.ItemCloudInABottle; +import info.jbcs.minecraft.chisel.item.ItemSmashingRock; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.Configuration; + +import java.io.File; @Mod(modid = "chisel", name = "Chisel", version = "1.5.4d") @@ -55,7 +54,6 @@ public class Chisel public static int particlesTickrate; public static boolean blockDescriptions; public static boolean ghostCloud; - public static boolean iceMelt; public static final StepSoundEx soundHolystoneFootstep = new StepSoundEx("chisel:holystone", "chisel:holystone", "chisel:holystone", 1.0f); public static final StepSoundEx soundTempleFootstep = new StepSoundEx("dig.stone", "chisel:temple-footstep", "dig.stone", 1.0f); diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index ee7b1a92..509e7f34 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -1,29 +1,6 @@ package info.jbcs.minecraft.chisel; -import info.jbcs.minecraft.chisel.block.BlockCarvable; -import info.jbcs.minecraft.chisel.block.BlockCarvableGlass; -import info.jbcs.minecraft.chisel.block.BlockCarvablePane; -import info.jbcs.minecraft.chisel.block.BlockCarvablePowered; -import info.jbcs.minecraft.chisel.block.BlockCloud; -import info.jbcs.minecraft.chisel.block.BlockConcrete; -import info.jbcs.minecraft.chisel.block.BlockEldritch; -import info.jbcs.minecraft.chisel.block.BlockHolystone; -import info.jbcs.minecraft.chisel.block.BlockLavastone; -import info.jbcs.minecraft.chisel.block.BlockLightstoneCarvable; -import info.jbcs.minecraft.chisel.block.BlockMarbleBookshelf; -import info.jbcs.minecraft.chisel.block.BlockMarbleCarpet; -import info.jbcs.minecraft.chisel.block.BlockMarbleIce; -import info.jbcs.minecraft.chisel.block.BlockMarbleIceStairs; -import info.jbcs.minecraft.chisel.block.BlockMarblePillar; -import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; -import info.jbcs.minecraft.chisel.block.BlockMarbleStairs; -import info.jbcs.minecraft.chisel.block.BlockMarbleStairsMaker; -import info.jbcs.minecraft.chisel.block.BlockMarbleStairsMakerCreator; -import info.jbcs.minecraft.chisel.block.BlockMarbleWall; -import info.jbcs.minecraft.chisel.block.BlockRoadLine; -import info.jbcs.minecraft.chisel.block.BlockSnakestone; -import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; -import info.jbcs.minecraft.chisel.block.BlockSpikes; +import info.jbcs.minecraft.chisel.block.*; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.carving.Carving; @@ -444,7 +421,7 @@ public class ChiselBlocks if(Chisel.featureEnabled("ironBlock")) { - blockIron = (BlockCarvable) new BlockCarvable().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); + blockIron = (BlockBeaconBase) new BlockBeaconBase().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("iron", Blocks.iron_block, 0, 0); blockIron.carverHelper.addVariation("Large iron ingots", 1, "iron/terrain-iron-largeingot"); blockIron.carverHelper.addVariation("Small iron ingots", 2, "iron/terrain-iron-smallingot"); @@ -467,7 +444,7 @@ public class ChiselBlocks if(Chisel.featureEnabled("goldBlock")) { - blockGold = (BlockCarvable) new BlockCarvable().setHardness(3F).setResistance(10F).setStepSound(Block.soundTypeMetal); + blockGold = (BlockBeaconBase) new BlockBeaconBase().setHardness(3F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("gold", Blocks.gold_block, 0, 0); blockGold.carverHelper.addVariation("Large golden ingots", 1, "gold/terrain-gold-largeingot"); blockGold.carverHelper.addVariation("Small golden ingots", 2, "gold/terrain-gold-smallingot"); @@ -489,7 +466,7 @@ public class ChiselBlocks if(Chisel.featureEnabled("diamondBlock")) { - blockDiamond = (BlockCarvable) new BlockCarvable().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); + blockDiamond = (BlockBeaconBase) new BlockBeaconBase().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("diamond", Blocks.diamond_block, 0, 0); blockDiamond.carverHelper.addVariation("Embossed diamond block", 1, "diamond/terrain-diamond-embossed"); blockDiamond.carverHelper.addVariation("Diamond block with panel", 2, "diamond/terrain-diamond-gem"); @@ -548,7 +525,7 @@ public class ChiselBlocks if(Chisel.featureEnabled("emeraldBlock")) { - blockEmerald = (BlockCarvable) new BlockCarvable().setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); + blockEmerald = (BlockBeaconBase) new BlockBeaconBase().setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("emerald", Blocks.emerald_block, 0, 0); blockEmerald.carverHelper.addVariation("Emerald panel", 1, "emerald/a1-blockemerald-emeraldpanel"); blockEmerald.carverHelper.addVariation("Classic emerald panel", 2, "emerald/a1-blockemerald-emeraldpanelclassic"); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java new file mode 100644 index 00000000..ee889ea5 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java @@ -0,0 +1,16 @@ +package info.jbcs.minecraft.chisel.block; + +import net.minecraft.world.IBlockAccess; + +/** + * Created by Pokefenn + */ +public class BlockBeaconBase extends BlockCarvable +{ + + @Override + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) + { + return true; + } +}