From a7c3273b08b470d12490701a514e3be3d95ed592 Mon Sep 17 00:00:00 2001 From: Bob Date: Fri, 29 Dec 2023 21:58:30 +0100 Subject: [PATCH] whatever garbage --- src/main/java/com/hbm/handler/FuelHandler.java | 4 ++-- .../hbm/inventory/recipes/ShredderRecipes.java | 8 +++++++- .../hbm/textures/blocks/stone_keyhole.png | Bin 455 -> 487 bytes 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hbm/handler/FuelHandler.java b/src/main/java/com/hbm/handler/FuelHandler.java index 18442a5a2..b89b86d58 100644 --- a/src/main/java/com/hbm/handler/FuelHandler.java +++ b/src/main/java/com/hbm/handler/FuelHandler.java @@ -29,8 +29,8 @@ public class FuelHandler implements IFuelHandler { if(fuel.getItem() == ModItems.biomass) return single * 2; if(fuel.getItem() == ModItems.biomass_compressed) return single * 4; if(fuel.getItem() == ModItems.powder_coal) return single * 8; - if(fuel.getItem() == ModItems.scrap) return single / 2; - if(fuel.getItem() == ModItems.dust) return single / 2; + if(fuel.getItem() == ModItems.scrap) return single / 4; + if(fuel.getItem() == ModItems.dust) return single / 8; if(fuel.getItem() == Item.getItemFromBlock(ModBlocks.block_scrap)) return single * 2; if(fuel.getItem() == ModItems.powder_fire) return 6400; if(fuel.getItem() == ModItems.lignite) return 1200; diff --git a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java index aee7d21ae..99e574056 100644 --- a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java @@ -79,7 +79,11 @@ public class ShredderRecipes extends SerializableRecipe { } } - if(name.length() > 3 && name.substring(0, 4).equals("dust")) { + if(name.length() > 7 && name.substring(0, 8).equals("dustTiny")) { + for(ItemStack stack : matches) { + putIfValid(stack, new ItemStack(ModItems.dust_tiny), name); + } + } else if(name.length() > 3 && name.substring(0, 4).equals("dust")) { for(ItemStack stack : matches) { putIfValid(stack, new ItemStack(ModItems.dust), name); } @@ -132,6 +136,7 @@ public class ShredderRecipes extends SerializableRecipe { /* Primary recipes */ ShredderRecipes.setRecipe(ModItems.scrap, new ItemStack(ModItems.dust)); ShredderRecipes.setRecipe(ModItems.dust, new ItemStack(ModItems.dust)); + ShredderRecipes.setRecipe(ModItems.dust_tiny, new ItemStack(ModItems.dust_tiny)); ShredderRecipes.setRecipe(Blocks.glowstone, new ItemStack(Items.glowstone_dust, 4)); ShredderRecipes.setRecipe(new ItemStack(Blocks.quartz_block, 1, 0), new ItemStack(ModItems.powder_quartz, 4)); ShredderRecipes.setRecipe(new ItemStack(Blocks.quartz_block, 1, 1), new ItemStack(ModItems.powder_quartz, 4)); @@ -199,6 +204,7 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(Items.reeds, new ItemStack(Items.sugar, 3)); ShredderRecipes.setRecipe(Items.apple, new ItemStack(Items.sugar, 1)); ShredderRecipes.setRecipe(Items.carrot, new ItemStack(Items.sugar, 1)); + ShredderRecipes.setRecipe(ModItems.can_empty, new ItemStack(ModItems.powder_aluminium, 2)); List logs = OreDictionary.getOres("logWood"); List planks = OreDictionary.getOres("plankWood"); diff --git a/src/main/resources/assets/hbm/textures/blocks/stone_keyhole.png b/src/main/resources/assets/hbm/textures/blocks/stone_keyhole.png index 394785a63409548bc65a99b4d8ce9627d17faa29..b083e0730275554380af2471f2a280d99ca5989d 100644 GIT binary patch delta 445 zcmV;u0Yd)A1Lp&fG=H8+L_t(Ijg6BrYg9oLg}=8x(##ZNHH3$f?m-Hx6w6j=k|v~7 zkd%RtGWiAT4-mArv9j7y0z#Ut77MFDgy|i^6vDupfhEOi@p8xPx+b1#ihIvJ_ntG= zcs%}_bv6-1)ka(QXf1)*4t*+XktL82Nj3^sAu8qYwa5~7f4KW#19!ht n!dI`#Pbn2Eg;?JAYlZkX_7C3a7P~%)00000NkvXXu0mjfc&OIR delta 413 zcmV;O0b>5=1IGi9G=F|cL_t(Ijct>$ZsRZzM4ti$h)f9}&VUGmO@J%d+r_-sNUoIDRyB(rd{2ODw zW*{pJA>f>227g|wosZ+l`{BU-?t8Vc-MRedoQr>8<6o@A7`H(Zu(g&SPfx{0&bb6h z<|WqK5CX=S5{#4*&(p+m+dvuSH1YTLU&p*P#(c|oz5iht%9-@Zw+yjf&CNr3JmK>b zfc52t{${sU(Tb;NN5ElOfGxg>Yu`xZB00000NkvXX Hu0mjfTinPB