From 7f927621de00e55ad6cedca256a6f54cfa12c2be Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sun, 19 Apr 2020 21:06:33 +0200 Subject: New TC jar textures --- src/main/java/items/Item_IchorJarFilled.java | 24 +++++++++ .../items/Item_ThaumiumReinforcedJarFilled.java | 62 ++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 src/main/java/items/Item_IchorJarFilled.java create mode 100644 src/main/java/items/Item_ThaumiumReinforcedJarFilled.java (limited to 'src/main/java/items') diff --git a/src/main/java/items/Item_IchorJarFilled.java b/src/main/java/items/Item_IchorJarFilled.java new file mode 100644 index 0000000000..19c2ace122 --- /dev/null +++ b/src/main/java/items/Item_IchorJarFilled.java @@ -0,0 +1,24 @@ +package items; + +import cpw.mods.fml.common.registry.GameRegistry; +import thaumcraft.common.blocks.ItemJarFilled; + +public class Item_IchorJarFilled extends ItemJarFilled { + + private static final Item_IchorJarFilled instance = new Item_IchorJarFilled(); + + private Item_IchorJarFilled() { + super(); + } + + public static Item_IchorJarFilled getInstance() { + return instance; + } + + public void registerItem() { + super.setHasSubtypes(false); + final String unlocalizedName = "kekztech_ichorjarfilled_item"; + super.setUnlocalizedName(unlocalizedName); + GameRegistry.registerItem(getInstance(), unlocalizedName); + } +} diff --git a/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java b/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java new file mode 100644 index 0000000000..cc4be0e247 --- /dev/null +++ b/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java @@ -0,0 +1,62 @@ +package items; + +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import thaumcraft.common.blocks.ItemJarFilled; + +public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled { + + private static final Item_ThaumiumReinforcedJarFilled instance = new Item_ThaumiumReinforcedJarFilled(); + + private Item_ThaumiumReinforcedJarFilled() { + super(); + } + + public static Item_ThaumiumReinforcedJarFilled getInstance() { + return instance; + } + + public void registerItem() { + super.setHasSubtypes(false); + final String unlocalizedName = "kekztech_thaumiumreinforcedjarfilled_item"; + super.setUnlocalizedName(unlocalizedName); + GameRegistry.registerItem(getInstance(), unlocalizedName); + } + /* + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float par8, float par9, float par10) { + + final Block block = world.getBlock(x, y, z); + if(block == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) { + side = 1; + } else if(block != Blocks.vine && block != Blocks.tallgrass + && block != Blocks.deadbush && !block.isReplaceable(world, x, y, z)) { + // Displace target location if original target can't be replaced + if(side == 0) { + y--; + } + if(side == 1) { + y++; + } + if(side == 2) { + z--; + } + if(side == 3) { + z++; + } + if(side == 4) { + x--; + } + if(side == 5) { + x++; + } + } + + + }*/ +} -- cgit From d42f4996255a4e11b2c0b5beabaf24be0d870fcc Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sat, 25 Apr 2020 18:35:08 +0200 Subject: improved jars are correctly placed after picking them up. Also cleaned up recipe registration --- src/main/java/items/Item_IchorJarFilled.java | 95 ++++++++++++++++++++++ .../items/Item_ThaumiumReinforcedJarFilled.java | 63 +++++++++++++- 2 files changed, 155 insertions(+), 3 deletions(-) (limited to 'src/main/java/items') diff --git a/src/main/java/items/Item_IchorJarFilled.java b/src/main/java/items/Item_IchorJarFilled.java index 19c2ace122..f6072eee7f 100644 --- a/src/main/java/items/Item_IchorJarFilled.java +++ b/src/main/java/items/Item_IchorJarFilled.java @@ -1,6 +1,16 @@ package items; +import common.blocks.Block_IchorJar; +import common.tileentities.TE_IchorJar; import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; import thaumcraft.common.blocks.ItemJarFilled; public class Item_IchorJarFilled extends ItemJarFilled { @@ -21,4 +31,89 @@ public class Item_IchorJarFilled extends ItemJarFilled { super.setUnlocalizedName(unlocalizedName); GameRegistry.registerItem(getInstance(), unlocalizedName); } + + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float par8, float par9, float par10) { + + final Block block = world.getBlock(x, y, z); + if(block == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) { + side = 1; + } else if(block != Blocks.vine && block != Blocks.tallgrass + && block != Blocks.deadbush && !block.isReplaceable(world, x, y, z)) { + // Displace target location if original target can't be replaced + if(side == 0) { + y--; + } + if(side == 1) { + y++; + } + if(side == 2) { + z--; + } + if(side == 3) { + z++; + } + if(side == 4) { + x--; + } + if(side == 5) { + x++; + } + } + + if(stack.stackSize == 0) { + return false; + } else if(!player.canPlayerEdit(x, y, z, side, stack)) { + return false; + } else if(world.canPlaceEntityOnSide(Block_IchorJar.getInstance(), x, y, z, + false, side, player, stack)) { + + final Block jar = Block_IchorJar.getInstance(); + final int meta = this.getMetadata(stack.getItemDamage()); + final int idk = block.onBlockPlaced(world, x, y, z, side, par8, par9, par10, meta); + + if(placeBlockAt(stack, player, world, x, y, z, side, par9, par9, par10, idk)) { + + final TileEntity te = world.getTileEntity(x, y, z); + if(te != null && te instanceof TE_IchorJar && stack.hasTagCompound()) { + + final AspectList aspects = getAspects(stack); + if(aspects != null && aspects.size() == 1) { + ((TE_IchorJar) te).amount = aspects.getAmount(aspects.getAspects()[0]); + ((TE_IchorJar) te).aspect = aspects.getAspects()[0]; + } + + final String filter = stack.stackTagCompound.getString("AspectFilter"); + if(filter != null) { + ((TE_IchorJar) te).aspectFilter = Aspect.getAspect(filter); + } + } + + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), + (double) ((float) z + 0.5F), jar.stepSound.func_150496_b(), + (jar.stepSound.getVolume() + 1.0F) / 2.0F, jar.stepSound.getPitch() * 0.8F); + --stack.stackSize; + } + + return true; + } else { + return false; + } + } + + @Override + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ, int metadata) { + if (!world.setBlock(x, y, z, Block_IchorJar.getInstance(), metadata, 3)) { + return false; + } else { + if (world.getBlock(x, y, z) == Block_IchorJar.getInstance()) { + Block_IchorJar.getInstance().onBlockPlacedBy(world, x, y, z, player, stack); + Block_IchorJar.getInstance().onPostBlockPlaced(world, x, y, z, metadata); + } + + return true; + } + } } diff --git a/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java b/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java index cc4be0e247..4f8775b714 100644 --- a/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java +++ b/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java @@ -1,11 +1,16 @@ package items; +import common.blocks.Block_ThaumiumReinforcedJar; +import common.tileentities.TE_ThaumiumReinforcedJar; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; import thaumcraft.common.blocks.ItemJarFilled; public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled { @@ -26,7 +31,7 @@ public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled { super.setUnlocalizedName(unlocalizedName); GameRegistry.registerItem(getInstance(), unlocalizedName); } - /* + @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { @@ -57,6 +62,58 @@ public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled { } } - - }*/ + if(stack.stackSize == 0) { + return false; + } else if(!player.canPlayerEdit(x, y, z, side, stack)) { + return false; + } else if(world.canPlaceEntityOnSide(Block_ThaumiumReinforcedJar.getInstance(), x, y, z, + false, side, player, stack)) { + + final Block jar = Block_ThaumiumReinforcedJar.getInstance(); + final int meta = this.getMetadata(stack.getItemDamage()); + final int idk = block.onBlockPlaced(world, x, y, z, side, par8, par9, par10, meta); + + if(placeBlockAt(stack, player, world, x, y, z, side, par9, par9, par10, idk)) { + + final TileEntity te = world.getTileEntity(x, y, z); + if(te != null && te instanceof TE_ThaumiumReinforcedJar && stack.hasTagCompound()) { + + final AspectList aspects = getAspects(stack); + if(aspects != null && aspects.size() == 1) { + ((TE_ThaumiumReinforcedJar) te).amount = aspects.getAmount(aspects.getAspects()[0]); + ((TE_ThaumiumReinforcedJar) te).aspect = aspects.getAspects()[0]; + } + + final String filter = stack.stackTagCompound.getString("AspectFilter"); + if(filter != null) { + ((TE_ThaumiumReinforcedJar) te).aspectFilter = Aspect.getAspect(filter); + } + } + + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), + (double) ((float) z + 0.5F), jar.stepSound.func_150496_b(), + (jar.stepSound.getVolume() + 1.0F) / 2.0F, jar.stepSound.getPitch() * 0.8F); + --stack.stackSize; + } + + return true; + } else { + return false; + } + } + + @Override + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ, int metadata) { + if (!world.setBlock(x, y, z, Block_ThaumiumReinforcedJar.getInstance(), metadata, 3)) { + return false; + } else { + if (world.getBlock(x, y, z) == Block_ThaumiumReinforcedJar.getInstance()) { + Block_ThaumiumReinforcedJar.getInstance().onBlockPlacedBy(world, x, y, z, player, stack); + Block_ThaumiumReinforcedJar.getInstance().onPostBlockPlaced(world, x, y, z, metadata); + } + + return true; + } + } } -- cgit From f5c4c0cc44b50c631eb044f12fae5032584620ed Mon Sep 17 00:00:00 2001 From: Christina Berchtold Date: Sat, 25 Apr 2020 19:52:46 +0200 Subject: huge refactor of recipe and block registration --- src/main/java/items/Item_IchorJarFilled.java | 21 ++++++++++----------- .../items/Item_ThaumiumReinforcedJarFilled.java | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) (limited to 'src/main/java/items') diff --git a/src/main/java/items/Item_IchorJarFilled.java b/src/main/java/items/Item_IchorJarFilled.java index f6072eee7f..1b62c3f29f 100644 --- a/src/main/java/items/Item_IchorJarFilled.java +++ b/src/main/java/items/Item_IchorJarFilled.java @@ -1,11 +1,10 @@ package items; -import common.blocks.Block_IchorJar; +import common.Blocks; import common.tileentities.TE_IchorJar; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -37,10 +36,10 @@ public class Item_IchorJarFilled extends ItemJarFilled { float par8, float par9, float par10) { final Block block = world.getBlock(x, y, z); - if(block == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) { + if(block == net.minecraft.init.Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) { side = 1; - } else if(block != Blocks.vine && block != Blocks.tallgrass - && block != Blocks.deadbush && !block.isReplaceable(world, x, y, z)) { + } else if(block != net.minecraft.init.Blocks.vine && block != net.minecraft.init.Blocks.tallgrass + && block != net.minecraft.init.Blocks.deadbush && !block.isReplaceable(world, x, y, z)) { // Displace target location if original target can't be replaced if(side == 0) { y--; @@ -66,10 +65,10 @@ public class Item_IchorJarFilled extends ItemJarFilled { return false; } else if(!player.canPlayerEdit(x, y, z, side, stack)) { return false; - } else if(world.canPlaceEntityOnSide(Block_IchorJar.getInstance(), x, y, z, + } else if(world.canPlaceEntityOnSide(Blocks.jarIchor, x, y, z, false, side, player, stack)) { - final Block jar = Block_IchorJar.getInstance(); + final Block jar = Blocks.jarIchor; final int meta = this.getMetadata(stack.getItemDamage()); final int idk = block.onBlockPlaced(world, x, y, z, side, par8, par9, par10, meta); @@ -105,12 +104,12 @@ public class Item_IchorJarFilled extends ItemJarFilled { @Override public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!world.setBlock(x, y, z, Block_IchorJar.getInstance(), metadata, 3)) { + if (!world.setBlock(x, y, z, Blocks.jarIchor, metadata, 3)) { return false; } else { - if (world.getBlock(x, y, z) == Block_IchorJar.getInstance()) { - Block_IchorJar.getInstance().onBlockPlacedBy(world, x, y, z, player, stack); - Block_IchorJar.getInstance().onPostBlockPlaced(world, x, y, z, metadata); + if (world.getBlock(x, y, z) == Blocks.jarIchor) { + Blocks.jarIchor.onBlockPlacedBy(world, x, y, z, player, stack); + Blocks.jarIchor.onPostBlockPlaced(world, x, y, z, metadata); } return true; diff --git a/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java b/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java index 4f8775b714..47b37837b7 100644 --- a/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java +++ b/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java @@ -1,11 +1,10 @@ package items; -import common.blocks.Block_ThaumiumReinforcedJar; +import common.Blocks; import common.tileentities.TE_ThaumiumReinforcedJar; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -37,10 +36,10 @@ public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled { float par8, float par9, float par10) { final Block block = world.getBlock(x, y, z); - if(block == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) { + if(block == net.minecraft.init.Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) { side = 1; - } else if(block != Blocks.vine && block != Blocks.tallgrass - && block != Blocks.deadbush && !block.isReplaceable(world, x, y, z)) { + } else if(block != net.minecraft.init.Blocks.vine && block != net.minecraft.init.Blocks.tallgrass + && block != net.minecraft.init.Blocks.deadbush && !block.isReplaceable(world, x, y, z)) { // Displace target location if original target can't be replaced if(side == 0) { y--; @@ -66,10 +65,10 @@ public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled { return false; } else if(!player.canPlayerEdit(x, y, z, side, stack)) { return false; - } else if(world.canPlaceEntityOnSide(Block_ThaumiumReinforcedJar.getInstance(), x, y, z, + } else if(world.canPlaceEntityOnSide(Blocks.jarThaumiumReinforced, x, y, z, false, side, player, stack)) { - final Block jar = Block_ThaumiumReinforcedJar.getInstance(); + final Block jar = Blocks.jarThaumiumReinforced; final int meta = this.getMetadata(stack.getItemDamage()); final int idk = block.onBlockPlaced(world, x, y, z, side, par8, par9, par10, meta); @@ -105,12 +104,12 @@ public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled { @Override public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!world.setBlock(x, y, z, Block_ThaumiumReinforcedJar.getInstance(), metadata, 3)) { + if (!world.setBlock(x, y, z, Blocks.jarThaumiumReinforced, metadata, 3)) { return false; } else { - if (world.getBlock(x, y, z) == Block_ThaumiumReinforcedJar.getInstance()) { - Block_ThaumiumReinforcedJar.getInstance().onBlockPlacedBy(world, x, y, z, player, stack); - Block_ThaumiumReinforcedJar.getInstance().onPostBlockPlaced(world, x, y, z, metadata); + if (world.getBlock(x, y, z) == Blocks.jarThaumiumReinforced) { + Blocks.jarThaumiumReinforced.onBlockPlacedBy(world, x, y, z, player, stack); + Blocks.jarThaumiumReinforced.onPostBlockPlaced(world, x, y, z, metadata); } return true; -- cgit From 1731699923f01e166a2c3520a7afe10d7b31e28b Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Wed, 13 May 2020 11:29:09 +0200 Subject: code cleanup, recipe fix --- src/main/java/items/Item_IchorJarFilled.java | 118 --------------------- .../items/Item_ThaumiumReinforcedJarFilled.java | 118 --------------------- 2 files changed, 236 deletions(-) delete mode 100644 src/main/java/items/Item_IchorJarFilled.java delete mode 100644 src/main/java/items/Item_ThaumiumReinforcedJarFilled.java (limited to 'src/main/java/items') diff --git a/src/main/java/items/Item_IchorJarFilled.java b/src/main/java/items/Item_IchorJarFilled.java deleted file mode 100644 index 1b62c3f29f..0000000000 --- a/src/main/java/items/Item_IchorJarFilled.java +++ /dev/null @@ -1,118 +0,0 @@ -package items; - -import common.Blocks; -import common.tileentities.TE_IchorJar; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.blocks.ItemJarFilled; - -public class Item_IchorJarFilled extends ItemJarFilled { - - private static final Item_IchorJarFilled instance = new Item_IchorJarFilled(); - - private Item_IchorJarFilled() { - super(); - } - - public static Item_IchorJarFilled getInstance() { - return instance; - } - - public void registerItem() { - super.setHasSubtypes(false); - final String unlocalizedName = "kekztech_ichorjarfilled_item"; - super.setUnlocalizedName(unlocalizedName); - GameRegistry.registerItem(getInstance(), unlocalizedName); - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float par8, float par9, float par10) { - - final Block block = world.getBlock(x, y, z); - if(block == net.minecraft.init.Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) { - side = 1; - } else if(block != net.minecraft.init.Blocks.vine && block != net.minecraft.init.Blocks.tallgrass - && block != net.minecraft.init.Blocks.deadbush && !block.isReplaceable(world, x, y, z)) { - // Displace target location if original target can't be replaced - if(side == 0) { - y--; - } - if(side == 1) { - y++; - } - if(side == 2) { - z--; - } - if(side == 3) { - z++; - } - if(side == 4) { - x--; - } - if(side == 5) { - x++; - } - } - - if(stack.stackSize == 0) { - return false; - } else if(!player.canPlayerEdit(x, y, z, side, stack)) { - return false; - } else if(world.canPlaceEntityOnSide(Blocks.jarIchor, x, y, z, - false, side, player, stack)) { - - final Block jar = Blocks.jarIchor; - final int meta = this.getMetadata(stack.getItemDamage()); - final int idk = block.onBlockPlaced(world, x, y, z, side, par8, par9, par10, meta); - - if(placeBlockAt(stack, player, world, x, y, z, side, par9, par9, par10, idk)) { - - final TileEntity te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TE_IchorJar && stack.hasTagCompound()) { - - final AspectList aspects = getAspects(stack); - if(aspects != null && aspects.size() == 1) { - ((TE_IchorJar) te).amount = aspects.getAmount(aspects.getAspects()[0]); - ((TE_IchorJar) te).aspect = aspects.getAspects()[0]; - } - - final String filter = stack.stackTagCompound.getString("AspectFilter"); - if(filter != null) { - ((TE_IchorJar) te).aspectFilter = Aspect.getAspect(filter); - } - } - - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), - (double) ((float) z + 0.5F), jar.stepSound.func_150496_b(), - (jar.stepSound.getVolume() + 1.0F) / 2.0F, jar.stepSound.getPitch() * 0.8F); - --stack.stackSize; - } - - return true; - } else { - return false; - } - } - - @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float hitX, float hitY, float hitZ, int metadata) { - if (!world.setBlock(x, y, z, Blocks.jarIchor, metadata, 3)) { - return false; - } else { - if (world.getBlock(x, y, z) == Blocks.jarIchor) { - Blocks.jarIchor.onBlockPlacedBy(world, x, y, z, player, stack); - Blocks.jarIchor.onPostBlockPlaced(world, x, y, z, metadata); - } - - return true; - } - } -} diff --git a/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java b/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java deleted file mode 100644 index 47b37837b7..0000000000 --- a/src/main/java/items/Item_ThaumiumReinforcedJarFilled.java +++ /dev/null @@ -1,118 +0,0 @@ -package items; - -import common.Blocks; -import common.tileentities.TE_ThaumiumReinforcedJar; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.blocks.ItemJarFilled; - -public class Item_ThaumiumReinforcedJarFilled extends ItemJarFilled { - - private static final Item_ThaumiumReinforcedJarFilled instance = new Item_ThaumiumReinforcedJarFilled(); - - private Item_ThaumiumReinforcedJarFilled() { - super(); - } - - public static Item_ThaumiumReinforcedJarFilled getInstance() { - return instance; - } - - public void registerItem() { - super.setHasSubtypes(false); - final String unlocalizedName = "kekztech_thaumiumreinforcedjarfilled_item"; - super.setUnlocalizedName(unlocalizedName); - GameRegistry.registerItem(getInstance(), unlocalizedName); - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float par8, float par9, float par10) { - - final Block block = world.getBlock(x, y, z); - if(block == net.minecraft.init.Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 7) < 1) { - side = 1; - } else if(block != net.minecraft.init.Blocks.vine && block != net.minecraft.init.Blocks.tallgrass - && block != net.minecraft.init.Blocks.deadbush && !block.isReplaceable(world, x, y, z)) { - // Displace target location if original target can't be replaced - if(side == 0) { - y--; - } - if(side == 1) { - y++; - } - if(side == 2) { - z--; - } - if(side == 3) { - z++; - } - if(side == 4) { - x--; - } - if(side == 5) { - x++; - } - } - - if(stack.stackSize == 0) { - return false; - } else if(!player.canPlayerEdit(x, y, z, side, stack)) { - return false; - } else if(world.canPlaceEntityOnSide(Blocks.jarThaumiumReinforced, x, y, z, - false, side, player, stack)) { - - final Block jar = Blocks.jarThaumiumReinforced; - final int meta = this.getMetadata(stack.getItemDamage()); - final int idk = block.onBlockPlaced(world, x, y, z, side, par8, par9, par10, meta); - - if(placeBlockAt(stack, player, world, x, y, z, side, par9, par9, par10, idk)) { - - final TileEntity te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TE_ThaumiumReinforcedJar && stack.hasTagCompound()) { - - final AspectList aspects = getAspects(stack); - if(aspects != null && aspects.size() == 1) { - ((TE_ThaumiumReinforcedJar) te).amount = aspects.getAmount(aspects.getAspects()[0]); - ((TE_ThaumiumReinforcedJar) te).aspect = aspects.getAspects()[0]; - } - - final String filter = stack.stackTagCompound.getString("AspectFilter"); - if(filter != null) { - ((TE_ThaumiumReinforcedJar) te).aspectFilter = Aspect.getAspect(filter); - } - } - - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), - (double) ((float) z + 0.5F), jar.stepSound.func_150496_b(), - (jar.stepSound.getVolume() + 1.0F) / 2.0F, jar.stepSound.getPitch() * 0.8F); - --stack.stackSize; - } - - return true; - } else { - return false; - } - } - - @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float hitX, float hitY, float hitZ, int metadata) { - if (!world.setBlock(x, y, z, Blocks.jarThaumiumReinforced, metadata, 3)) { - return false; - } else { - if (world.getBlock(x, y, z) == Blocks.jarThaumiumReinforced) { - Blocks.jarThaumiumReinforced.onBlockPlacedBy(world, x, y, z, player, stack); - Blocks.jarThaumiumReinforced.onPostBlockPlaced(world, x, y, z, metadata); - } - - return true; - } - } -} -- cgit From fd8609b7cc92b862382ff02a352843d6725ad9c7 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Sun, 17 May 2020 20:01:38 +0200 Subject: Disabling Item Proxy tech again --- src/main/java/items/Item_Configurator.java | 43 ------------------------------ 1 file changed, 43 deletions(-) delete mode 100644 src/main/java/items/Item_Configurator.java (limited to 'src/main/java/items') diff --git a/src/main/java/items/Item_Configurator.java b/src/main/java/items/Item_Configurator.java deleted file mode 100644 index ed319eb37e..0000000000 --- a/src/main/java/items/Item_Configurator.java +++ /dev/null @@ -1,43 +0,0 @@ -package items; - -import java.util.List; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class Item_Configurator extends Item { - - private static final Item_Configurator instance = new Item_Configurator(); - - private Item_Configurator() { - // I am a singleton - } - - public static Item_Configurator getInstance() { - return instance; - } - - public void registerItem() { - super.setHasSubtypes(false); - final String unlocalizedName = "kekztech_configurator"; - super.setUnlocalizedName(unlocalizedName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setMaxStackSize(1); - super.setTextureName(KekzCore.MODID + ":" + "DiamondHeatPipe"); - GameRegistry.registerItem(getInstance(), unlocalizedName); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { - list.add("Used to configure Item Proxy Networks"); - if(stack.hasTagCompound() && stack.getTagCompound().hasKey("config")) { - list.add("Channel: " + stack.getTagCompound().getString("config")); - } - } - -} -- cgit