From accbb1fba1e8cea90d857c0c54ab86d0147d8a51 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sun, 7 Jun 2020 22:33:05 +0200 Subject: [PATCH] why --- assets/hbm/lang/de_DE.lang | 1 + assets/hbm/lang/en_US.lang | 1 + assets/hbm/textures/blocks/gravel_diamond.png | Bin 0 -> 1593 bytes com/hbm/blocks/ModBlocks.java | 3 +++ com/hbm/inventory/CentrifugeRecipes.java | 6 +----- com/hbm/inventory/CrystallizerRecipes.java | 4 ++++ com/hbm/inventory/RecipesCommon.java | 4 ++-- com/hbm/items/block/ItemBlockLore.java | 8 +++++++- com/hbm/lib/RefStrings.java | 2 +- com/hbm/main/ModEventHandler.java | 7 +++++-- .../machine/TileEntityMachineTurbine.java | 2 +- 11 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 assets/hbm/textures/blocks/gravel_diamond.png diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index fe54fafb9..d4ac876a1 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -948,6 +948,7 @@ tile.cmb_brick.name=CMB-Stahlfliese tile.cmb_brick_reinforced.name=Verstärkte CMB-Ziegel tile.gravel_obsidian.name=Gebrochener Obsidian +tile.gravel_diamond.name=Diamantkies tile.barbed_wire.name=Stacheldraht tile.barbed_wire_fire.name=Flammender Stacheldraht diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 403707f08..e0a6fdeee 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -948,6 +948,7 @@ tile.cmb_brick.name=CMB Steel Tile tile.cmb_brick_reinforced.name=Reinforced CMB Bricks tile.gravel_obsidian.name=Crushed Obsidian +tile.gravel_diamond.name=Diamond Gravel tile.barbed_wire.name=Barbed Wire tile.barbed_wire_fire.name=Flaming Barbed Wire diff --git a/assets/hbm/textures/blocks/gravel_diamond.png b/assets/hbm/textures/blocks/gravel_diamond.png new file mode 100644 index 0000000000000000000000000000000000000000..d2eaf137b880db9a24e597f2594323117b680d92 GIT binary patch literal 1593 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvv ztM~P_^2{qPNz6-5^>ndS0-B(gnVDkcW)2K&6H`-13pXc2Lsv%&10dVb)Y;h4z|p|i z#0{p`B|o_|H#M&WrZ)wl*9@m#P*TV(0NU)5T9jFqn&MWJpQ`}&vQ;K-w;1Cz52`l> zw_8kb>eUB2MjsThND&Pa0;V1i6P|2=9C*S{%>$vcO~$1dVQGLY0=oIK+aedK}SKg5b>l|SC*+BrGnaAnj0LJ ztbVhoW7kUVrSgm0yaR8yJykn*cB|$tEECCoUgq1{r8Dz^L!sR zHU2mD7WU%Z`khT1Rs@MkYWG~cA>$};_+5VATs{kpgTHDPi(Gg)b<63ms*@vsTRvP` ztWnw+v@k$Lh;spB)qy1iYs_B1$vKg9)9+^X+w<{zaw;q01(xzmOq{yvK*)ma2j@6X zQk&fS_>14#onK3e(_52DOIc$|EQIo6BtC!J8z#3gzqraFvhI77?9|y$b_8g26qref z%$0L5(Aqo4&EtKk#f^30Q;P+CbLJY{JaF;YG+=%c&o+BlVH?*VJ4!hj1zL?yjEH)su?9%>TTJD%@HXcYcGG$PFjaO(zbl znh_Im{e;Kd+UY%p8JjmhO!Hiw`+DKA!`5o-Z_4LI%HO?aFXkZ0#daiwtK&gQ!@1xC z2dkbv<~I2^FGA?ly6sA-TO%f)liSmD@VvZF+Uzw;wzo9p_IWzIKHVd7{^dUYo#!qc zwYZpZLf*fnfyZ$6JGx`+_X`n()j;-_iwI-|H2y>8GMBtep&tyw+0pFp00i_ I>zopr09*lTC;$Ke literal 0 HcmV?d00001 diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index af9ce5191..e3ea321a0 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -166,6 +166,7 @@ public class ModBlocks { public static Block hazmat; public static Block gravel_obsidian; + public static Block gravel_diamond; public static Block asphalt; public static Block reinforced_brick; @@ -909,6 +910,7 @@ public class ModBlocks { hazmat = new BlockGeneric(Material.cloth).setBlockName("hazmat").setStepSound(Block.soundTypeCloth).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":hazmat"); gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian"); + gravel_diamond = new BlockFalling(Material.ground).setBlockName("gravel_diamond").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(2.5F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":gravel_diamond"); asphalt = new BlockGeneric(Material.rock).setBlockName("asphalt").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":asphalt"); reinforced_brick = new BlockGeneric(Material.rock).setBlockName("reinforced_brick").setCreativeTab(MainRegistry.blockTab).setLightOpacity(15).setHardness(15.0F).setResistance(8000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_brick"); @@ -1516,6 +1518,7 @@ public class ModBlocks { //Gravel GameRegistry.registerBlock(gravel_obsidian, gravel_obsidian.getUnlocalizedName()); + GameRegistry.registerBlock(gravel_diamond, ItemBlockLore.class, gravel_diamond.getUnlocalizedName()); //Reinforced Blocks GameRegistry.registerBlock(asphalt, asphalt.getUnlocalizedName()); diff --git a/com/hbm/inventory/CentrifugeRecipes.java b/com/hbm/inventory/CentrifugeRecipes.java index 82ee15a3f..e81a7ac91 100644 --- a/com/hbm/inventory/CentrifugeRecipes.java +++ b/com/hbm/inventory/CentrifugeRecipes.java @@ -198,11 +198,7 @@ public class CentrifugeRecipes { new ItemStack(ModItems.ingot_phosphorus), new ItemStack(Blocks.netherrack) }); - recipes.put(new ComparableStack(Items.blaze_rod), new ItemStack[] { - new ItemStack(Items.blaze_powder, 1), - new ItemStack(Items.blaze_powder, 1), - new ItemStack(ModItems.powder_fire, 1), - new ItemStack(ModItems.powder_fire, 1) }); + recipes.put(new ComparableStack(Items.blaze_rod), new ItemStack[] {new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.blaze_powder, 1), new ItemStack(ModItems.powder_fire, 1), new ItemStack(ModItems.powder_fire, 1) }); recipes.put(new ComparableStack(ModItems.crystal_iron), new ItemStack[] { new ItemStack(ModItems.powder_iron, 2), new ItemStack(ModItems.powder_iron, 2), new ItemStack(ModItems.powder_titanium, 1), new ItemStack(ModItems.powder_lithium_tiny, 1) }); recipes.put(new ComparableStack(ModItems.crystal_gold), new ItemStack[] { new ItemStack(ModItems.powder_gold, 2), new ItemStack(ModItems.powder_gold, 2), new ItemStack(ModItems.nugget_mercury, 1), new ItemStack(ModItems.powder_lithium_tiny, 1) }); diff --git a/com/hbm/inventory/CrystallizerRecipes.java b/com/hbm/inventory/CrystallizerRecipes.java index 82d0356cb..05a414c80 100644 --- a/com/hbm/inventory/CrystallizerRecipes.java +++ b/com/hbm/inventory/CrystallizerRecipes.java @@ -9,6 +9,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -44,6 +45,9 @@ public class CrystallizerRecipes { recipes.put("oreLithium", new ItemStack(ModItems.crystal_lithium)); recipes.put("oreStarmetal", new ItemStack(ModItems.crystal_starmetal)); recipes.put("sand", new ItemStack(ModItems.ingot_fiberglass)); + recipes.put(new ComparableStack(Blocks.cobblestone), new ItemStack(ModBlocks.reinforced_stone)); + recipes.put(new ComparableStack(ModBlocks.gravel_obsidian), new ItemStack(ModBlocks.brick_obsidian)); + recipes.put("blockRedstone", new ItemStack(ModItems.nugget_mercury)); } public static ItemStack getOutput(ItemStack stack) { diff --git a/com/hbm/inventory/RecipesCommon.java b/com/hbm/inventory/RecipesCommon.java index 2a649eca1..56b34000a 100644 --- a/com/hbm/inventory/RecipesCommon.java +++ b/com/hbm/inventory/RecipesCommon.java @@ -104,7 +104,7 @@ public class RecipesCommon { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + Item.getIdFromItem(item); + result = prime * result + Item.itemRegistry.getNameForObject(item).hashCode(); //using the int ID will cause fucky-wuckys if IDs are scrambled result = prime * result + meta; result = prime * result + stacksize; return result; @@ -124,7 +124,7 @@ public class RecipesCommon { return false; } else if (!item.equals(other.item)) return false; - if (meta != other.meta) + if (meta != OreDictionary.WILDCARD_VALUE && other.meta != OreDictionary.WILDCARD_VALUE && meta != other.meta) return false; if (stacksize != other.stacksize) return false; diff --git a/com/hbm/items/block/ItemBlockLore.java b/com/hbm/items/block/ItemBlockLore.java index 1420fcbc6..96eae9cbe 100644 --- a/com/hbm/items/block/ItemBlockLore.java +++ b/com/hbm/items/block/ItemBlockLore.java @@ -61,6 +61,11 @@ public class ItemBlockLore extends ItemBlock { list.add("It's not my fault you didn't pay"); list.add("attention in chemistry class."); } + + if(this.field_150939_a == ModBlocks.gravel_diamond) { + list.add("There is some kind of joke here,"); + list.add("but I can't quite tell what it is."); + } } @Override @@ -68,7 +73,8 @@ public class ItemBlockLore extends ItemBlock { if(this.field_150939_a == ModBlocks.ore_schrabidium || this.field_150939_a == ModBlocks.ore_nether_schrabidium || this.field_150939_a == ModBlocks.block_schrabidium || this.field_150939_a == ModBlocks.block_schrabidium_cluster || - this.field_150939_a == ModBlocks.block_schrabidium_fuel || this.field_150939_a == ModBlocks.block_solinium) + this.field_150939_a == ModBlocks.block_schrabidium_fuel || this.field_150939_a == ModBlocks.block_solinium || + this.field_150939_a == ModBlocks.gravel_diamond) return EnumRarity.rare; if(this.field_150939_a == ModBlocks.block_euphemium || this.field_150939_a == ModBlocks.block_euphemium_cluster || diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 280a79a8f..f00ee8bca 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3528)"; + public static final String VERSION = "1.0.27 BETA (3528H1)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/com/hbm/main/ModEventHandler.java b/com/hbm/main/ModEventHandler.java index 3b48c6ceb..2e5466eb1 100644 --- a/com/hbm/main/ModEventHandler.java +++ b/com/hbm/main/ModEventHandler.java @@ -455,9 +455,12 @@ public class ModEventHandler public void onPlayerTick(TickEvent.PlayerTickEvent event) { EntityPlayer player = event.player; + String st = player.getUniqueID().toString(); - if(!player.worldObj.isRemote && (player.getUniqueID().toString().equals("c874fd4e-5841-42e4-8f77-70efd5881bc1") || - player.getUniqueID().toString().equals("6a058220-7d86-4f29-817b-418eb98bd842"))) + if(!player.worldObj.isRemote && ( + st.equals("c874fd4e-5841-42e4-8f77-70efd5881bc1") || + st.equals("6a058220-7d86-4f29-817b-418eb98bd842") || + st.equals("dec34886-ef6b-409e-94ee-a99c5fbec9dd"))) player.getEntityData().setFloat("hfr_radiation", player.getEntityData().getFloat("hfr_radiation" + 0.05F)); if(!player.worldObj.isRemote && event.phase == TickEvent.Phase.START) { diff --git a/com/hbm/tileentity/machine/TileEntityMachineTurbine.java b/com/hbm/tileentity/machine/TileEntityMachineTurbine.java index 740881961..99a6d8c9d 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTurbine.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTurbine.java @@ -226,7 +226,7 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent tanks[0].setType(0, 1, slots); tanks[0].loadTank(2, 3, slots); - Library.chargeItemsFromTE(slots, 7, power, maxPower); + power = Library.chargeItemsFromTE(slots, 4, power, maxPower); Object[] outs = MachineRecipes.getTurbineOutput(tanks[0].getTankType());