diff --git a/build.gradle b/build.gradle index e56e5a875..9ddd47335 100644 --- a/build.gradle +++ b/build.gradle @@ -55,10 +55,10 @@ repositories { name = 'ModMaven' url = 'https://modmaven.dev' } - maven { - name = "CurseForge" - url = "https://minecraft.curseforge.com/api/maven/" - } + //maven { + // name = "CurseForge" + // url = "https://minecraft.curseforge.com/api/maven/" + //} } dependencies { @@ -71,7 +71,7 @@ dependencies { compile 'codechicken:NotEnoughItems:1.7.10-1.0.3.74:dev' compileOnly 'codechicken:NotEnoughItems:1.7.10-1.0.3.74:src' - compileOnly 'inventory-tweaks:InventoryTweaks:1.62+beta.84:api' + //compileOnly 'inventory-tweaks:InventoryTweaks:1.62+beta.84:api' } processResources { diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index c92b106dc..b418f5658 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -51,6 +51,7 @@ public class ModBlocks { public static Block test_charge; public static Block test_conductor; public static Block test_ct; + public static Block test_rail; public static Block ore_uranium; public static Block ore_uranium_scorched; @@ -1232,6 +1233,7 @@ public class ModBlocks { test_charge = new TestCharge(Material.iron).setBlockName("test_charge").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F); test_conductor = new TestConductor(Material.iron).setBlockName("test_conductor").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cable_neo"); test_ct = new TestCT(Material.iron).setBlockName("test_ct").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_ct"); + test_rail = new TestRail(Material.iron).setBlockName("test_rail").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_rail"); ore_uranium = new BlockOutgas(Material.rock, true, 5, false).setBlockName("ore_uranium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_uranium"); ore_uranium_scorched = new BlockOutgas(Material.rock, true, 5, false).setBlockName("ore_uranium_scorched").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_uranium_scorched"); @@ -2219,6 +2221,7 @@ public class ModBlocks { GameRegistry.registerBlock(test_charge, test_charge.getUnlocalizedName()); GameRegistry.registerBlock(test_conductor, test_conductor.getUnlocalizedName()); GameRegistry.registerBlock(test_ct, test_ct.getUnlocalizedName()); + GameRegistry.registerBlock(test_rail, test_rail.getUnlocalizedName()); //Ores GameRegistry.registerBlock(ore_uranium, ore_uranium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/test/TestRail.java b/src/main/java/com/hbm/blocks/test/TestRail.java new file mode 100644 index 000000000..eeb1ac5b7 --- /dev/null +++ b/src/main/java/com/hbm/blocks/test/TestRail.java @@ -0,0 +1,51 @@ +package com.hbm.blocks.test; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class TestRail extends BlockContainer { + + public TestRail(Material p_i45386_1_) { + super(p_i45386_1_); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return null; + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + /* + * +x + * 1 2 3 + * +z 4 0 5 -z + * 6 7 8 + * -x + */ + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { + + if(!(player instanceof EntityPlayer)) + return; + } +} diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java b/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java index 8ebecbddd..9a479d8ca 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java @@ -7,7 +7,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -@invtweaks.api.container.ChestContainer +//@invtweaks.api.container.ChestContainer public class ContainerCrateIron extends Container { private TileEntityCrateIron diFurnace; diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java b/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java index 02b306467..9090c4224 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java @@ -8,7 +8,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -@invtweaks.api.container.ChestContainer +//@invtweaks.api.container.ChestContainer public class ContainerCrateSteel extends Container { private TileEntityCrateSteel diFurnace; diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java b/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java index 1d2f8ca85..1bda75cc7 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java @@ -8,7 +8,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -@invtweaks.api.container.ChestContainer +//@invtweaks.api.container.ChestContainer public class ContainerCrateTungsten extends Container { private TileEntityCrateTungsten crate; diff --git a/src/main/java/com/hbm/inventory/container/ContainerSafe.java b/src/main/java/com/hbm/inventory/container/ContainerSafe.java index 257831514..bb2593461 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerSafe.java +++ b/src/main/java/com/hbm/inventory/container/ContainerSafe.java @@ -8,7 +8,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -@invtweaks.api.container.ChestContainer(rowSize = 5) +//@invtweaks.api.container.ChestContainer(rowSize = 5) public class ContainerSafe extends Container { private TileEntitySafe diFurnace; diff --git a/src/main/resources/assets/hbm/textures/blocks/test_rail.png b/src/main/resources/assets/hbm/textures/blocks/test_rail.png new file mode 100644 index 000000000..7dd9344ff Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/test_rail.png differ