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

rebalanced assembly machine plate recipe, removed ticking from d.grass

Browse Source
This commit is contained in:
HbmMods 2019-03-13 21:21:53 +01:00
parent 847f4a2bf9
commit 71e9818997
10 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,7 @@ chem.CC_HEATING=Fortgeschrittene Kohleverflüssigung
chem.CC_HEAVY=Einfache Kohleverflüssigung
chem.CC_NAPHTHA=Naphtha-Kohleverflüssigung
chem.ASPHALT=Asphaltherstellung
chem.CONCRETE=Betonherstellung
chem.COOLANT=Kühlflüssigkeit mischen
chem.CRYOGEL=Kryogel mischen
chem.DESH=Deshherstellung
@ -768,6 +769,7 @@ tile.reinforced_light.name=Verstärkter Glowstone
tile.reinforced_lamp_off.name=Verstärkte Lampe
tile.reinforced_lamp_on.name=Verstärkte Lampe
tile.reinforced_stone.name=Verdichteter Stein
tile.concrete_smooth.name=Beton
tile.concrete.name=Betonfliese
tile.brick_concrete.name=Betonziegel

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

@ -96,6 +96,7 @@ chem.CC_HEATING=Advanced Coal Liquefaction
chem.CC_HEAVY=Basic Coal Liquefaction
chem.CC_NAPHTHA=Naphtha Coal Liquefaction
chem.ASPHALT=Asphalt Production
chem.CONCRETE=Concrete Production
chem.COOLANT=Coolant Mixing
chem.CRYOGEL=Cryogel Mixing
chem.DESH=Desh Production
@ -768,6 +769,7 @@ tile.reinforced_light.name=Reinforced Glowstone
tile.reinforced_lamp_off.name=Reinforced Lamp
tile.reinforced_lamp_on.name=Reinforced Lamp
tile.reinforced_stone.name=Dense Stone
tile.concrete_smooth.name=Concrete
tile.concrete.name=Concrete Tile
tile.brick_concrete.name=Concrete Bricks

BIN
assets/hbm/textures/gui/bobmazon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
assets/hbm/textures/gui/gui_bobmazon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

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

@ -793,8 +793,8 @@ public class ModBlocks {
waste_earth = new WasteEarth(Material.ground, 0.25F, 7.5F).setBlockName("waste_earth").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":waste_earth");
waste_mycelium = new WasteEarth(Material.ground, 1F, 25F).setBlockName("waste_mycelium").setStepSound(Block.soundTypeGrass).setLightLevel(1F).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":waste_mycelium_side");
waste_trinitite = new BlockOre(Material.sand, 0.5F, 10F).setBlockName("waste_trinitite").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":waste_trinitite");
waste_trinitite_red = new BlockOre(Material.sand, 0.5F,10F).setBlockName("waste_trinitite_red").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":waste_trinitite_red");
waste_trinitite = new BlockOre(Material.sand).setBlockName("waste_trinitite").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":waste_trinitite");
waste_trinitite_red = new BlockOre(Material.sand).setBlockName("waste_trinitite_red").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":waste_trinitite_red");
waste_log = new WasteLog(Material.wood).setBlockName("waste_log").setStepSound(Block.soundTypeWood).setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(2.5F);
waste_planks = new BlockOre(Material.wood).setBlockName("waste_planks").setStepSound(Block.soundTypeWood).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":waste_planks");
frozen_dirt = new BlockOre(Material.wood).setBlockName("frozen_dirt").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setResistance(2.5F).setBlockTextureName(RefStrings.MODID + ":frozen_dirt");

8
com/hbm/blocks/generic/WasteEarth.java
View File

@ -48,7 +48,7 @@ public class WasteEarth extends Block {
public WasteEarth(Material mat, float rad, float max) {
super(mat);
this.setTickRandomly(true);
//this.setTickRandomly(true);
radIn = rad;
radMax = max;
}
@ -133,7 +133,7 @@ public class WasteEarth extends Block {
world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world));
}
if((this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium) && world.getBlock(x, y + 1, z) == Blocks.air && rand.nextInt(1000) == 0)
if((this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium) && world.getBlock(x, y + 1, z) == Blocks.air && rand.nextInt(10) == 0)
{
Block b0;
int count = 0;
@ -202,7 +202,7 @@ public class WasteEarth extends Block {
world.setBlock(x, y, z, Blocks.dirt);
}
@Override
/*@Override
public int tickRate(World world) {
if(this.radIn > 0)
@ -217,6 +217,6 @@ public class WasteEarth extends Block {
if(this.radIn > 0)
world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world));
}
}*/
}

12
com/hbm/entity/effect/EntityFalloutRain.java
View File

@ -134,7 +134,7 @@ public class EntityFalloutRain extends Entity {
return;
} else if(b == Blocks.sand) {
if(rand.nextInt(20) == 0)
if(rand.nextInt(60) == 0)
worldObj.setBlock(x, y, z, meta == 0 ? ModBlocks.waste_trinitite : ModBlocks.waste_trinitite_red);
return;
}
@ -150,11 +150,11 @@ public class EntityFalloutRain extends Entity {
}
else if (b == Blocks.coal_ore) {
int ra = rand.nextInt(10);
if (ra < 3) {
int ra = rand.nextInt(30);
if (ra < 9) {
worldObj.setBlock(x, y, z, Blocks.diamond_ore);
}
if (ra == 3) {
if (ra == 9) {
worldObj.setBlock(x, y, z, Blocks.emerald_ore);
}
return;
@ -177,13 +177,13 @@ public class EntityFalloutRain extends Entity {
}
else if (b == ModBlocks.ore_uranium) {
if (rand.nextInt(30) == 0)
if (rand.nextInt(90) == 0)
worldObj.setBlock(x, y, z, ModBlocks.ore_schrabidium);
return;
}
else if (b == ModBlocks.ore_nether_uranium) {
if (rand.nextInt(30) == 0)
if (rand.nextInt(90) == 0)
worldObj.setBlock(x, y, z, ModBlocks.ore_nether_schrabidium);
return;

42
com/hbm/inventory/MachineRecipes.java
View File

@ -593,25 +593,25 @@ public class MachineRecipes {
if(stamps_wire.contains(stamp.getItem())) {
if(mODE(input, "ingotAluminum"))
return new ItemStack(ModItems.wire_aluminium, 3);
return new ItemStack(ModItems.wire_aluminium, 8);
if(mODE(input, "ingotCopper"))
return new ItemStack(ModItems.wire_copper, 3);
return new ItemStack(ModItems.wire_copper, 8);
if(mODE(input, "ingotTungsten"))
return new ItemStack(ModItems.wire_tungsten, 3);
return new ItemStack(ModItems.wire_tungsten, 8);
if(mODE(input, "ingotRedAlloy"))
return new ItemStack(ModItems.wire_red_copper, 3);
return new ItemStack(ModItems.wire_red_copper, 8);
if(mODE(input, "ingotRedstoneAlloy"))
return new ItemStack(ModItems.wire_red_copper, 3);
return new ItemStack(ModItems.wire_red_copper, 8);
if(mODE(input, "ingotGold"))
return new ItemStack(ModItems.wire_gold, 3);
return new ItemStack(ModItems.wire_gold, 8);
if(mODE(input, "ingotSchrabidium"))
return new ItemStack(ModItems.wire_schrabidium, 3);
return new ItemStack(ModItems.wire_schrabidium, 8);
if(mODE(input, "ingotAdvanced"))
return new ItemStack(ModItems.wire_advanced_alloy, 3);
return new ItemStack(ModItems.wire_advanced_alloy, 8);
if(mODE(input, "ingotAdvancedAlloy"))
return new ItemStack(ModItems.wire_advanced_alloy, 3);
return new ItemStack(ModItems.wire_advanced_alloy, 8);
if(mODE(input, "ingotMagnetizedTungsten"))
return new ItemStack(ModItems.wire_magnetized_tungsten, 3);
return new ItemStack(ModItems.wire_magnetized_tungsten, 8);
}
if(stamps_circuit.contains(stamp.getItem())) {
@ -2168,37 +2168,37 @@ public class MachineRecipes {
switch(ItemAssemblyTemplate.EnumAssemblyTemplate.getEnum(stack.getItemDamage())) {
case IRON_PLATE:
list.add(new ItemStack(Items.iron_ingot, 1));
list.add(new ItemStack(Items.iron_ingot, 3));
break;
case GOLD_PLATE:
list.add(new ItemStack(Items.gold_ingot, 1));
list.add(new ItemStack(Items.gold_ingot, 3));
break;
case TITANIUM_PLATE:
list.add(new ItemStack(ModItems.ingot_titanium, 1));
list.add(new ItemStack(ModItems.ingot_titanium, 3));
break;
case ALUMINIUM_PLATE:
list.add(new ItemStack(ModItems.ingot_aluminium, 1));
list.add(new ItemStack(ModItems.ingot_aluminium, 3));
break;
case STEEL_PLATE:
list.add(new ItemStack(ModItems.ingot_steel, 1));
list.add(new ItemStack(ModItems.ingot_steel, 3));
break;
case LEAD_PLATE:
list.add(new ItemStack(ModItems.ingot_lead, 1));
list.add(new ItemStack(ModItems.ingot_lead, 3));
break;
case COPPER_PLATE:
list.add(new ItemStack(ModItems.ingot_copper, 1));
list.add(new ItemStack(ModItems.ingot_copper, 3));
break;
case ADVANCED_PLATE:
list.add(new ItemStack(ModItems.ingot_advanced_alloy, 1));
list.add(new ItemStack(ModItems.ingot_advanced_alloy, 3));
break;
case SCHRABIDIUM_PLATE:
list.add(new ItemStack(ModItems.ingot_schrabidium, 1));
list.add(new ItemStack(ModItems.ingot_schrabidium, 3));
break;
case CMB_PLATE:
list.add(new ItemStack(ModItems.ingot_combine_steel, 1));
list.add(new ItemStack(ModItems.ingot_combine_steel, 3));
break;
case SATURN_PLATE:
list.add(new ItemStack(ModItems.ingot_saturnite, 1));
list.add(new ItemStack(ModItems.ingot_saturnite, 3));
break;
case ALUMINIUM_WIRE:
list.add(new ItemStack(ModItems.ingot_aluminium, 1));

24
com/hbm/lib/Library.java
View File

@ -698,41 +698,41 @@ public class Library {
} else break;
}
if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_desh && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index]))
if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_desh && ItemBattery.getCharge(slots[index]) >= ItemBattery.getMaxChargeStatic(slots[index]))
slots[index] = new ItemStack(ModItems.dynosphere_desh_charged);
if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_schrabidium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index]))
if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_schrabidium && ItemBattery.getCharge(slots[index]) >= ItemBattery.getMaxChargeStatic(slots[index]))
slots[index] = new ItemStack(ModItems.dynosphere_schrabidium_charged);
if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_euphemium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index]))
if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_euphemium && ItemBattery.getCharge(slots[index]) >= ItemBattery.getMaxChargeStatic(slots[index]))
slots[index] = new ItemStack(ModItems.dynosphere_euphemium_charged);
if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_dineutronium && ItemBattery.getCharge(slots[index]) == ItemBattery.getMaxChargeStatic(slots[index]))
if(slots[index] != null && slots[index].getItem() == ModItems.dynosphere_dineutronium && ItemBattery.getCharge(slots[index]) >= ItemBattery.getMaxChargeStatic(slots[index]))
slots[index] = new ItemStack(ModItems.dynosphere_dineutronium_charged);
}
for(int i = 0; i < 50; i++)
if(power - 1 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_sword && slots[index].getItemDamage() > 0)
if(power - 10 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_sword && slots[index].getItemDamage() > 0)
{
power -= 1;
power -= 10;
slots[index].setItemDamage(slots[index].getItemDamage() - 1);
} else break;
for(int i = 0; i < 50; i++)
if(power - 1 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_pickaxe && slots[index].getItemDamage() > 0)
if(power - 10 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_pickaxe && slots[index].getItemDamage() > 0)
{
power -= 1;
power -= 10;
slots[index].setItemDamage(slots[index].getItemDamage() - 1);
} else break;
for(int i = 0; i < 50; i++)
if(power - 1 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_axe && slots[index].getItemDamage() > 0)
if(power - 10 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_axe && slots[index].getItemDamage() > 0)
{
power -= 1;
power -= 10;
slots[index].setItemDamage(slots[index].getItemDamage() - 1);
} else break;
for(int i = 0; i < 50; i++)
if(power - 1 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_shovel && slots[index].getItemDamage() > 0)
if(power - 10 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.elec_shovel && slots[index].getItemDamage() > 0)
{
power -= 1;
power -= 10;
slots[index].setItemDamage(slots[index].getItemDamage() - 1);
} else break;

2
com/hbm/main/CraftingManager.java
View File

@ -112,6 +112,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_sulfur), 1), new Object[] { "###", "###", "###", '#', ModItems.sulfur });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_titanium), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_titanium });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_tungsten), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_tungsten });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_uranium), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_uranium });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_thorium), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_th232 });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_lead), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_lead });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_trinitite), 1), new Object[] { "###", "###", "###", '#', ModItems.trinitite });
@ -718,6 +719,7 @@ public class CraftingManager {
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_computer), 1), new Object[] { "DTD", "TMT", "DTD", 'D', "dustDiamond", 'T', "dustMagnetizedTungsten", 'M', ModBlocks.block_meteor }));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_core), 1), new Object[] { "CMC", "MAM", "CMC", 'C', ModItems.circuit_schrabidium, 'M', ModBlocks.fwatz_computer, 'A', ModBlocks.fwatz_conductor }));
GameRegistry.addRecipe(new ItemStack(ModBlocks.reinforced_stone, 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.cobblestone, 'B', Blocks.stone });
//GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.asphalt), 8), new Object[] { "BGB", "GSG", "BGB", 'B', ModItems.canister_bitumen, 'G', Blocks.gravel, 'S', Blocks.sand });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_light), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.fence, 'B', Blocks.brick_block });
//GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.concrete_smooth), 8), new Object[] { "SGS", "GWG", "SGS", 'S', Blocks.sand, 'G', Blocks.gravel, 'W', Items.water_bucket });