diff --git a/.gradle/8.2.1/fileHashes/fileHashes.lock b/.gradle/8.2.1/fileHashes/fileHashes.lock index a0b0cd9..0bcf2d6 100644 Binary files a/.gradle/8.2.1/fileHashes/fileHashes.lock and b/.gradle/8.2.1/fileHashes/fileHashes.lock differ diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index dcf31d4..cffe077 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -117,6 +117,8 @@ public class CinderLoE { public static Block goldChain; public static Block ironChain; public static Block bronzeChain; + public static Block plaster; + public static Block voidblock; //Food Crop blocks public static Block onionCrop; @@ -376,11 +378,11 @@ public class CinderLoE { reedBale = (new ReedBale()); GameRegistry.registerBlock(reedBale, "reedBale"); - // Runed Dwarven Brick + // Unique dwarvenBrickRuned = (new RunedDwarvenBrick()); GameRegistry.registerBlock(dwarvenBrickRuned, "dwarvenBrickRuned"); - // Fish Barrel + // Barrel fishBarrel = (new FishBarrel()); GameRegistry.registerBlock(fishBarrel, "fishbarrel"); @@ -394,15 +396,19 @@ public class CinderLoE { bronzeChain = (new bronzeChain()); GameRegistry.registerBlock(bronzeChain, "bronzeChain"); - // Mist Block + // Staff mistBlock = (new MistBlock()); GameRegistry.registerBlock(mistBlock, "mist"); + voidblock = (new voidblock()); + GameRegistry.registerBlock(voidblock, "voidblock"); - // Drystones + // Building Blocks cutDrystone = (new cutDrystone()); GameRegistry.registerBlock(cutDrystone, "cutDrystone"); cobbleDrystone = (new cobbleDrystone()); GameRegistry.registerBlock(cobbleDrystone, "cobbleDrystone"); + plaster = (new plaster()); + GameRegistry.registerBlock(plaster, "plaster"); //Food Crops onionCrop = new onionCrop().setBlockName("onion"); @@ -428,9 +434,9 @@ public class CinderLoE { spice = new CinderItemFood(1, 0.0f, false).setdamageAmount(2).setPotionEffect(Potion.moveSpeed.id, 10,0,100).setUnlocalizedName("lotr:spice").setTextureName("lotr:spice"); spicedHam = new CinderItemFood(9, 0.6f, true).setdamageAmount(2).setPotionEffect(Potion.moveSpeed.id, 60, 0, 100).setUnlocalizedName("lotr:spicedHam").setTextureName("lotr:spicedHam"); // spice = new LOTRItemFood(1, 0.0f, false).setPotionEffect(Potion.moveSpeed.id, 10,0,100).setUnlocalizedName("lotr:spice"); - pelmen = new LOTRItemFood(6, 1.0f, true).setUnlocalizedName("lotr:pelmen").setTextureName("lotr:pelmen"); - onion = new LOTRItemFood(6, 1.0f, false).setUnlocalizedName("lotr:onion").setTextureName("lotr:onion"); - cabbage = new LOTRItemFood(6, 1.0f, false).setUnlocalizedName("lotr:cabbage").setTextureName("lotr:cabbage"); + pelmen = new LOTRItemFood(4, 3.0f, true).setUnlocalizedName("lotr:pelmen").setTextureName("lotr:pelmen"); + onion = new LOTRItemFood(3, 0.3f, false).setUnlocalizedName("lotr:onion").setTextureName("lotr:onion"); + cabbage = new LOTRItemFood(4, 0.5f, false).setUnlocalizedName("lotr:cabbage").setTextureName("lotr:cabbage"); lightStew = new LOTRItemStew(6, 0.7f, false).setPotionEffect(Potion.damageBoost.id, 60, 0, 100).setUnlocalizedName("lotr:lightStew").setTextureName("lotr:lightStew"); // Red Dwarf Spawns redDwarfWarriorSpawnEgg = new CinderLoESpawnEgg(RedDwarfWarrior.class).setTextureName("lotr:spawn_egg"); @@ -931,6 +937,8 @@ public class CinderLoE { CinderCore.registerItemFallback(Block.getIdFromBlock(cutDrystone), Block.getIdFromBlock(LOTRMod.cobblebrick), "cinder_loe", "1.2"); CinderCore.registerItemFallback(Block.getIdFromBlock(cobbleDrystone), Block.getIdFromBlock(LOTRMod.cobblebrick), "cinder_loe", "1.2"); CinderCore.registerItemFallback(Block.getIdFromBlock(reeflessCoral), Block.getIdFromBlock(LOTRMod.coralReef), "cinder_loe", "1.2"); + CinderCore.registerItemFallback(Block.getIdFromBlock(plaster), Block.getIdFromBlock(Blocks.brick_block), "cinder_loe", "1.2.1"); + CinderCore.registerItemFallback(Block.getIdFromBlock(voidblock), Block.getIdFromBlock(Blocks.coal_block), "cinder_loe", "1.2.1"); // == Red Dwarf Items== CinderCore.registerItemFallback(Item.getIdFromItem(redDwarfSteel), Item.getIdFromItem(LOTRMod.dwarfSteel), "cinder_loe", "1.0"); CinderCore.registerItemFallback(Item.getIdFromItem(spearRedDwarf), Item.getIdFromItem(LOTRMod.spearDwarven), "cinder_loe", "1.0"); diff --git a/src/main/java/com/zivilon/cinder_loe/blocks/plaster.java b/src/main/java/com/zivilon/cinder_loe/blocks/plaster.java new file mode 100644 index 0000000..7879480 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/blocks/plaster.java @@ -0,0 +1,28 @@ +package com.zivilon.cinder_loe.blocks; + +import com.zivilon.cinder_loe.util.Utilities; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; + +public class plaster extends Block { + + public plaster() { + super(Material.rock); // Choose the appropriate material + // Set other properties like hardness, resistance, name, etc. + setHardness(2.0F); + setResistance(5.0F); + setBlockTextureName(Utilities.toSnakeCase("lotr:plaster")); + setBlockName("lotr:plaster"); + setCreativeTab((CreativeTabs)Utilities.reflected_tab_block); + } + + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + this.blockIcon = iconRegister.registerIcon("lotr:plaster"); + } + +} diff --git a/src/main/java/com/zivilon/cinder_loe/blocks/voidblock.java b/src/main/java/com/zivilon/cinder_loe/blocks/voidblock.java new file mode 100644 index 0000000..8964cf3 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/blocks/voidblock.java @@ -0,0 +1,27 @@ +package com.zivilon.cinder_loe.blocks; + +import com.zivilon.cinder_loe.util.Utilities; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; + +public class voidblock extends Block { + + public voidblock() { + super(Material.rock); // Choose the appropriate material + // Set other properties like hardness, resistance, name, etc. + setHardness(100.0F); + setResistance(100.0F); + setBlockTextureName(Utilities.toSnakeCase("lotr:voidblock")); + setBlockName("lotr:voidblock"); + } + + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + this.blockIcon = iconRegister.registerIcon("lotr:voidblock"); + } + +} diff --git a/src/main/resources/assets/cinder_loe/lang/en_US.lang b/src/main/resources/assets/cinder_loe/lang/en_US.lang index 36d362c..c7d5f3e 100644 --- a/src/main/resources/assets/cinder_loe/lang/en_US.lang +++ b/src/main/resources/assets/cinder_loe/lang/en_US.lang @@ -16,6 +16,8 @@ tile.lotr:fishbarrel.name=Barrel of Fish tile.lotr:reeflessCoral.name=Cut Coral tile.lotr:cutDrystone.name=Cut Drystone tile.lotr:cobbleDrystone.name=Cobbled Drystone +tile.lotr:plaster.name=Plaster +tile.lotr:voidblock.name=Void item.lotr:frostblade.name=Frostblade item.lotr:whip.name=Whip @@ -42,6 +44,13 @@ item.lotr:sarumanStaff.name=Staff of Saruman of Many Colors item.lotr:welfRelic.name=Horn of the Greenwood Stag +item.lotr:onion.name=Onion +item.lotr:cabbage.name=Cabbage +item.lotr:pelmen.name=pelmeni +item.lotr:lightStew.name=Light Stew +item.lotr:spice.name=Spices +item.lotr:spicedHam.name=Spiced Ham + item.lotr:bonemold.name=Bonemold item.lotr:helmetLimwaith.name=Limwaith Helmet item.lotr:bodyLimwaith.name=Limwaith Chestplate @@ -58,6 +67,8 @@ item.lotr:truncheonLimwaith.name=Limwaith Truncheon item.lotr:daggerLimwaith.name=Limwaith Dagger item.lotr:daggerLimwaithPoisoned.name=Poisoned Limwaith Dagger item.lotr:blowgunLimwaith.name=Limwaith Blowgun + +item.lotr:helmetBreeKettle.name=Bree-land Kettle Helmet item.lotr:helmetBree.name=Bree-land Helmet item.lotr:bodyBree.name=Bree-land Chestplate item.lotr:legsBree.name=Bree-land Leggings diff --git a/src/main/resources/assets/lotr/textures/blocks/plaster.png b/src/main/resources/assets/lotr/textures/blocks/plaster.png new file mode 100644 index 0000000..e6c909e Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/plaster.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/voidblock.png b/src/main/resources/assets/lotr/textures/blocks/voidblock.png new file mode 100644 index 0000000..e3640be Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/voidblock.png differ