xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

why

Browse Source
This commit is contained in:
HbmMods 2020-06-07 22:33:05 +02:00
parent 91b8b9386f
commit accbb1fba1
11 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/hbm/lang/de_DE.lang
View File

@ -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

1
assets/hbm/lang/en_US.lang
View File

@ -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

BIN
assets/hbm/textures/blocks/gravel_diamond.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

3
com/hbm/blocks/ModBlocks.java
View File

@ -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());

6
com/hbm/inventory/CentrifugeRecipes.java
View File

@ -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) });

4
com/hbm/inventory/CrystallizerRecipes.java
View File

@ -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) {

4
com/hbm/inventory/RecipesCommon.java
View File

@ -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;

8
com/hbm/items/block/ItemBlockLore.java
View File

@ -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 ||

2
com/hbm/lib/RefStrings.java
View File

@ -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

7
com/hbm/main/ModEventHandler.java
View File

@ -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) {

2
com/hbm/tileentity/machine/TileEntityMachineTurbine.java
View File

@ -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());