From cdf25f6be8df55e57657845608e603229cbf0675 Mon Sep 17 00:00:00 2001 From: KeyLime17 Date: Fri, 3 May 2024 17:40:49 -0400 Subject: [PATCH] cabbage and onion crop textures dont register, planting an onion or cabbage causes crash --- .gradle/8.2.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../com/zivilon/cinder_loe/CinderLoE.java | 22 +++++++++----- .../zivilon/cinder_loe/blocks/plaster.java | 28 ++++++++++++++++++ .../zivilon/cinder_loe/blocks/voidblock.java | 27 +++++++++++++++++ .../assets/cinder_loe/lang/en_US.lang | 11 +++++++ .../assets/lotr/textures/blocks/plaster.png | Bin 0 -> 5860 bytes .../assets/lotr/textures/blocks/voidblock.png | Bin 0 -> 1309 bytes 7 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/zivilon/cinder_loe/blocks/plaster.java create mode 100644 src/main/java/com/zivilon/cinder_loe/blocks/voidblock.java create mode 100644 src/main/resources/assets/lotr/textures/blocks/plaster.png create mode 100644 src/main/resources/assets/lotr/textures/blocks/voidblock.png diff --git a/.gradle/8.2.1/fileHashes/fileHashes.lock b/.gradle/8.2.1/fileHashes/fileHashes.lock index a0b0cd948cebe575ff120fdd9b317e2123a5aa30..0bcf2d6cbeaadcb27cc4918f7bef77c287bd2e2d 100644 GIT binary patch literal 17 VcmZRc9z7+~bjR9%3}En&4*)on1(yH- literal 17 VcmZRc9z7+~bjR9%3}Eo51pqk)1`7ZH 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 0000000000000000000000000000000000000000..e6c909e9b4175f7162e1bec14e5dad10842637fa GIT binary patch literal 5860 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 RypvT2hVu%iB8T8D{{hBs_JjZc literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e3640be3400155994ec93ba6c097bc45aec282db GIT binary patch literal 1309 zcmV+&1>*XNP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=HYj@%#&hW~Sl9s%1Jo8u4&Qg6`X_l10PXLeWG zs{5zX1O@#JtFD@2TJ`x5ug-%#+%Fg= zK`Y0j=X3mJr}&^m6+L|;6{Is)=h zoZ_2Rg=Z>vk3O+KL6Lme0}PMB%y;{to%G}2hZW*Co~7NMAM7T#i-#c3dyMX3jQ!YM zO&KB0=ccZ$tR4n#2)V3j8O3lb`nF0z@qp}YK;C1E8%m=>3@n2Zb*eOIUu~m?B_`h4 z&@wlcWpgnu+$08YO0&>llOkOlFdOg+tbDJ9mfy16HF7xagpo`TBh271tM4eE3XL&S zo+$bqE3AuWW?>nV+^jJQKxkZfq$|KzdA=rB0YP11c5JZ5?U2}%&fJ=LBnz})prSp_ z8d*OD5F+?iEQSOGaDGH-9wKHVLL41@Duf&dg*PA|Rqj|NCy@*|&eJ#M7_G6ae3npiTmY-Vo7s*5LA&u;F) zi`T+M@Nv|Vixn@W)C#8+$`!LK2GqLoCR^Hc%bRV!m8~|UPfJZ(Zq_`s(rV`}9p8zb zyLIoS*PV8x(w=tR^KQHEWv>INHe{rsBM%!s%BVLr3J2DAUhu zU*y6>_Z{TIME41~_uM|9*5|KHixL*0c?@Szqu}^q!0wg3&L6cex8ZLmyo6ptFQJ#v zOXwx^68e9H2L3!0{7L@}tgoWTODWMi0004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&Mm zKpe$iKcpg62MZQ)$WWauii$W&6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q( zAou~|?BJy6A|?JWDYS_3;J6>}?mh0_0p3Q1DTaRnP*hV-#bZJ?w<-i);YS#Q=)<_k z3@wpf%)oVg-NVDzyC~0cKlkV8mGcGzJOc3?({z(~gLr1s)Hv@GhgeCJiO-40bh;q% zBiAK|-#8a-_VUb-o=MFUhlqt@2TL8yO1eTkO&pOGmGZq=hh@%NoRvzAweHDZ7|g3H zX|B^8MjT5>APE5yYAB-u6H!`KQVgVMKjz{evi(VNN#rVnkz)Z>C=hKw_#gc4)+kI( zI!VD8(Dh-*TUnkRto8Msp0{%Ql5{Up8K)*?qh|2A-O-PWW%;Bp5D zKWU;a+LDi^w@?7y&*+n`u^?(FT~Gp+u9 z0IVc(z8Yu28~^|S24YJ`L;(K){{a7>y{D4^000SaNLh0L01m