mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
da704ddd64
@ -1,6 +1,6 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
maven { url = 'https://files.minecraftforge.net/maven' }
|
||||
maven { url = 'https://maven.minecraftforge.net/' }
|
||||
maven { url = 'https://plugins.gradle.org/m2' }
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
@ -148,6 +148,7 @@ public class ModBlocks {
|
||||
public static Block cluster_iron;
|
||||
public static Block cluster_titanium;
|
||||
public static Block cluster_aluminium;
|
||||
public static Block cluster_copper;
|
||||
|
||||
public static Block ore_oil;
|
||||
public static Block ore_oil_empty;
|
||||
@ -1259,6 +1260,7 @@ public class ModBlocks {
|
||||
cluster_iron = new BlockCluster(Material.rock).setBlockName("cluster_iron").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":cluster_iron");
|
||||
cluster_titanium = new BlockCluster(Material.rock).setBlockName("cluster_titanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":cluster_titanium");
|
||||
cluster_aluminium = new BlockCluster(Material.rock).setBlockName("cluster_aluminium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":cluster_aluminium");
|
||||
cluster_copper = new BlockCluster(Material.rock).setBlockName("cluster_copper").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":cluster_copper");
|
||||
|
||||
ore_nether_coal = new BlockNetherCoal(Material.rock, false, 5, true).setBlockName("ore_nether_coal").setCreativeTab(MainRegistry.blockTab).setLightLevel(10F/15F).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_coal");
|
||||
ore_nether_smoldering = new BlockSmolder(Material.rock).setBlockName("ore_nether_smoldering").setCreativeTab(MainRegistry.blockTab).setLightLevel(1F).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_smoldering");
|
||||
@ -2263,6 +2265,7 @@ public class ModBlocks {
|
||||
GameRegistry.registerBlock(cluster_iron, ItemBlockBase.class, cluster_iron.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(cluster_titanium, ItemBlockBase.class, cluster_titanium.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(cluster_aluminium, ItemBlockBase.class, cluster_aluminium.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(cluster_copper, ItemBlockBase.class, cluster_copper.getUnlocalizedName());
|
||||
|
||||
//Bedrock ores
|
||||
GameRegistry.registerBlock(ore_bedrock_coltan, ore_bedrock_coltan.getUnlocalizedName());
|
||||
|
||||
@ -87,7 +87,7 @@ public class BlockBobble extends BlockContainer {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubBlocks(Item item, CreativeTabs tab, List list) {
|
||||
|
||||
for(int i = 0; i < BobbleType.values().length; i++)
|
||||
for(int i = 1; i < BobbleType.values().length; i++)
|
||||
list.add(new ItemStack(item, 1, i));
|
||||
}
|
||||
|
||||
@ -175,6 +175,7 @@ public class BlockBobble extends BlockContainer {
|
||||
UFFR("UFFR", "UFFR", "All sorts of things from his PR", "fried shrimp", false),
|
||||
VAER("vaer", "vaer", "ZIRNOX", "taken de family out to the weekend cigarette festival", true),
|
||||
NOS("Dr Nostalgia", "Dr Nostalgia", "SSG and Vortex models", "Take a picture, I'ma pose, paparazzi$I've been drinking, moving like a zombie", true),
|
||||
DRILLGON("Drillgon200", "Drillgon200", "1.12 Port", null, false),
|
||||
//testing garbage. why is she so dumb?
|
||||
CIRNO("Cirno", "Cirno", "being a dumb ice fairy", "No brain. Head empty.", true);
|
||||
|
||||
|
||||
@ -58,14 +58,11 @@ public class BlockCluster extends Block implements IDrillInteraction, ITooltipPr
|
||||
|
||||
private Item getDrop() {
|
||||
|
||||
if(this == ModBlocks.cluster_iron)
|
||||
return ModItems.crystal_iron;
|
||||
if(this == ModBlocks.cluster_titanium)
|
||||
return ModItems.crystal_titanium;
|
||||
if(this == ModBlocks.cluster_aluminium)
|
||||
return ModItems.crystal_aluminium;
|
||||
if(this == ModBlocks.basalt_gem)
|
||||
return ModItems.gem_volcanic;
|
||||
if(this == ModBlocks.cluster_iron) return ModItems.crystal_iron;
|
||||
if(this == ModBlocks.cluster_titanium) return ModItems.crystal_titanium;
|
||||
if(this == ModBlocks.cluster_aluminium) return ModItems.crystal_aluminium;
|
||||
if(this == ModBlocks.cluster_copper) return ModItems.crystal_copper;
|
||||
if(this == ModBlocks.basalt_gem) return ModItems.gem_volcanic;
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -34,6 +34,7 @@ public class WorldConfig {
|
||||
public static int ironClusterSpawn = 4;
|
||||
public static int titaniumClusterSpawn = 2;
|
||||
public static int aluminiumClusterSpawn = 3;
|
||||
public static int copperClusterSpawn = 4;
|
||||
|
||||
public static int netherUraniumuSpawn = 8;
|
||||
public static int netherTungstenSpawn = 10;
|
||||
@ -109,6 +110,7 @@ public class WorldConfig {
|
||||
ironClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C00_ironClusterSpawn", "Amount of iron cluster veins per chunk", 4);
|
||||
titaniumClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C01_titaniumClusterSpawn", "Amount of titanium cluster veins per chunk", 2);
|
||||
aluminiumClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C02_aluminiumClusterSpawn", "Amount of aluminium cluster veins per chunk", 3);
|
||||
copperClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C03_copperClusterSpawn", "Amount of copper cluster veins per chunk", 4);
|
||||
|
||||
netherUraniumuSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.N00_uraniumSpawnrate", "Amount of nether uranium per chunk", 8);
|
||||
netherTungstenSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.N01_tungstenSpawnrate", "Amount of nether tungsten per chunk", 10);
|
||||
|
||||
@ -64,7 +64,8 @@ public class BulletConfiguration {
|
||||
//whether the bullet should stay alive after colliding with a block
|
||||
public boolean liveAfterImpact;
|
||||
|
||||
public boolean blackPowder = true;
|
||||
//creates a "muzzle flash" and a ton of smoke with every projectile spawned
|
||||
public boolean blackPowder = false;
|
||||
|
||||
//bullet effects
|
||||
public List<PotionEffect> effects;
|
||||
|
||||
@ -1483,7 +1483,7 @@ public class MachineRecipes {
|
||||
break;
|
||||
case DUCRETE:
|
||||
list.add(new ItemStack(Blocks.sand, 8));
|
||||
list.add(new ItemStack(ModItems.ingot_u238, 10));
|
||||
list.add(new ItemStack(ModItems.billet_u238, 2));
|
||||
list.add(new ItemStack(Items.clay_ball, 4));
|
||||
default:
|
||||
break;
|
||||
|
||||
@ -1653,7 +1653,6 @@ public class ModItems {
|
||||
public static Item gun_bf_ammo;
|
||||
public static Item gun_mp40;
|
||||
public static Item gun_mp40_ammo;
|
||||
public static Item gun_mg42;
|
||||
public static Item gun_thompson;
|
||||
public static Item gun_uzi;
|
||||
public static Item gun_uzi_silencer;
|
||||
@ -4316,7 +4315,6 @@ public class ModItems {
|
||||
gun_bf = new ItemGunBase(GunFatmanFactory.getBELConfig()).setUnlocalizedName("gun_bf").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_bf");
|
||||
gun_mp40_ammo = new Item().setUnlocalizedName("gun_mp40_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_mp40_ammo");
|
||||
gun_mp40 = new ItemGunBase(Gun9mmFactory.getMP40Config()).setUnlocalizedName("gun_mp40").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_mp40");
|
||||
gun_mg42 = new ItemGunBase(Gun9mmFactory.getMP40Config()).setUnlocalizedName("gun_mg42").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_mg42");
|
||||
gun_thompson = new ItemGunBase(Gun9mmFactory.getThompsonConfig()).setUnlocalizedName("gun_thompson").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_thompson");
|
||||
gun_uzi_ammo = new Item().setUnlocalizedName("gun_uzi_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_uzi_ammo");
|
||||
gun_uzi = new ItemGunBase(Gun22LRFactory.getUziConfig()).setUnlocalizedName("gun_uzi").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uzi");
|
||||
@ -7078,7 +7076,6 @@ public class ModItems {
|
||||
GameRegistry.registerItem(gun_mirv, gun_mirv.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_bf, gun_bf.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_mp40, gun_mp40.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_mg42, gun_mg42.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_thompson, gun_thompson.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_uzi, gun_uzi.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_uzi_silencer,gun_uzi_silencer.getUnlocalizedName());
|
||||
|
||||
@ -111,6 +111,7 @@ public class HbmWorldGen implements IWorldGenerator {
|
||||
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.ironClusterSpawn, 6, 5, 50, ModBlocks.cluster_iron);
|
||||
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.titaniumClusterSpawn, 6, 5, 30, ModBlocks.cluster_titanium);
|
||||
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.aluminiumClusterSpawn, 6, 5, 40, ModBlocks.cluster_aluminium);
|
||||
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.copperClusterSpawn, 6, 5, 20, ModBlocks.cluster_copper);
|
||||
|
||||
if(GeneralConfig.enable528ColtanSpawn) {
|
||||
DungeonToolbox.generateOre(world, rand, i, j, GeneralConfig.coltanRate, 4, 15, 40, ModBlocks.ore_coltan);
|
||||
|
||||
@ -345,6 +345,12 @@ public class Library {
|
||||
|
||||
//not great either but certainly better
|
||||
public static long chargeItemsFromTE(ItemStack[] slots, int index, long power, long maxPower) {
|
||||
|
||||
if(power < 0)
|
||||
return 0;
|
||||
|
||||
if(power > maxPower)
|
||||
return maxPower;
|
||||
|
||||
if(slots[index] != null && slots[index].getItem() instanceof IBatteryItem) {
|
||||
|
||||
|
||||
@ -393,7 +393,7 @@ public class ClientProxy extends ServerProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_uzi_silencer, new ItemRenderUZI());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_uzi_saturnite, new ItemRenderUZI());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_uzi_saturnite_silencer, new ItemRenderUZI());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_calamity, new ItemRenderOverkill());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_calamity, new ItemRenderWeaponFFMG42());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_calamity_dual, new ItemRenderOverkill());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_minigun, new ItemRenderOverkill());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_avenger, new ItemRenderOverkill());
|
||||
@ -414,7 +414,6 @@ public class ClientProxy extends ServerProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_bolter_digamma, new ItemRenderWeaponBolter());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_fireext, new ItemRenderFireExt());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_ar15, new ItemRenderWeaponAR15());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_mg42, new ItemRenderWeaponFFMG42());
|
||||
//multitool
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.multitool_dig, new ItemRenderMultitool());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.multitool_silk, new ItemRenderMultitool());
|
||||
|
||||
@ -349,7 +349,7 @@ public class CraftingManager {
|
||||
addRecipeAuto(new ItemStack(ModBlocks.ducrete, 4), new Object[] { "DD", "DD", 'D', ModBlocks.ducrete_smooth });
|
||||
addRecipeAuto(new ItemStack(ModBlocks.brick_ducrete, 4), new Object[] {"CDC", "DLD", "CDC", 'D', ModBlocks.ducrete_smooth, 'C', Items.clay_ball, 'L', ModItems.plate_lead });
|
||||
addRecipeAuto(new ItemStack(ModBlocks.brick_ducrete, 4), new Object[] {"CDC", "DLD", "CDC", 'D', ModBlocks.ducrete, 'C', Items.clay_ball, 'L', ModItems.plate_lead });
|
||||
addRecipeAuto(new ItemStack(ModBlocks.reinforced_ducrete, 4), new Object[] {"DSD", "SUS", "DSD", 'D', ModBlocks.brick_ducrete, 'S', ModItems.plate_steel, 'U', ModItems.ingot_u238 });
|
||||
addRecipeAuto(new ItemStack(ModBlocks.reinforced_ducrete, 4), new Object[] {"DSD", "SUS", "DSD", 'D', ModBlocks.brick_ducrete, 'S', ModItems.plate_steel, 'U', U238.billet() });
|
||||
addRecipeAuto(new ItemStack(ModBlocks.brick_obsidian, 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian });
|
||||
addRecipeAuto(new ItemStack(ModBlocks.meteor_polished, 4), new Object[] { "CC", "CC", 'C', ModBlocks.block_meteor_broken });
|
||||
addRecipeAuto(new ItemStack(ModBlocks.meteor_pillar, 2), new Object[] { "C", "C", 'C', ModBlocks.meteor_polished });
|
||||
@ -720,7 +720,8 @@ public class CraftingManager {
|
||||
addRecipeAuto(new ItemStack(ModItems.upgrade_shredder, 1), new Object[] { "PHP", "CUC", "DTD", 'P', ModItems.motor, 'H', Blocks.hopper, 'C', ModItems.blades_advanced_alloy, 'U', ModItems.upgrade_smelter, 'D', TI.plate(), 'T', ModBlocks.machine_transformer });
|
||||
addRecipeAuto(new ItemStack(ModItems.upgrade_centrifuge, 1), new Object[] { "PHP", "PUP", "DTD", 'P', ModItems.centrifuge_element, 'H', Blocks.hopper, 'U', ModItems.upgrade_shredder, 'D', POLYMER.ingot(), 'T', ModBlocks.machine_transformer });
|
||||
addRecipeAuto(new ItemStack(ModItems.upgrade_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.ACID.ordinal()), 'H', ModItems.circuit_targeting_tier4, 'C', ModBlocks.barrel_steel, 'U', ModItems.upgrade_centrifuge, 'D', ModItems.motor, 'T', ModBlocks.machine_transformer });
|
||||
|
||||
addRecipeAuto(new ItemStack(ModItems.upgrade_screm, 1), new Object[] { "SUS", "SCS", "SUS", 'S', STEEL.plate(), 'U', ModItems.upgrade_template, 'C', ModItems.crystal_xen });
|
||||
|
||||
addRecipeAuto(new ItemStack(ModItems.mech_key, 1), new Object[] { "MCM", "MKM", "MMM", 'M', ModItems.ingot_meteorite_forged, 'C', ModItems.coin_maskman, 'K', ModItems.key });
|
||||
addRecipeAuto(new ItemStack(ModItems.spawn_ufo, 1), new Object[] { "MMM", "DCD", "MMM", 'M', ModItems.ingot_meteorite, 'D', DNT.ingot(), 'C', ModItems.coin_worm });
|
||||
|
||||
|
||||
@ -182,18 +182,18 @@ public class ItemRenderLibrary {
|
||||
|
||||
renderers.put(Item.getItemFromBlock(ModBlocks.machine_industrial_generator), new ItemRenderBase() {
|
||||
public void renderInventory() {
|
||||
GL11.glTranslated(0, -1, 0);
|
||||
GL11.glScaled(4, 4, 4);
|
||||
GL11.glRotated(90, 0, 1, 0);
|
||||
}
|
||||
public void renderCommon() {
|
||||
GL11.glScaled(0.25, 0.25, 0.25);
|
||||
GL11.glTranslated(0, 0, -0.5);
|
||||
GL11.glScaled(0.75, 0.75, 0.75);
|
||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||
bindTexture(ResourceManager.igen_tex); ResourceManager.igen.renderPart("Base");
|
||||
bindTexture(ResourceManager.igen_rotor); ResourceManager.igen.renderPart("Rotor");
|
||||
bindTexture(ResourceManager.igen_cog); ResourceManager.igen.renderPart("CogLeft"); ResourceManager.igen.renderPart("CogRight");
|
||||
bindTexture(ResourceManager.igen_pistons); ResourceManager.igen.renderPart("Pistons");
|
||||
bindTexture(ResourceManager.igen_arm); ResourceManager.igen.renderPart("ArmLeft"); ResourceManager.igen.renderPart("ArmRight");
|
||||
bindTexture(ResourceManager.igen_tex);
|
||||
ResourceManager.igen.renderPart("Body");
|
||||
ResourceManager.igen.renderPart("Rotor");
|
||||
GL11.glEnable(GL11.GL_CULL_FACE);
|
||||
GL11.glShadeModel(GL11.GL_FLAT);
|
||||
}});
|
||||
|
||||
@ -15,8 +15,6 @@ import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@ -45,6 +43,7 @@ public class RenderBobble extends TileEntitySpecialRenderer {
|
||||
public static final ResourceLocation bobble_uffr = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/uffr.png");
|
||||
public static final ResourceLocation bobble_vaer = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/vaer.png");
|
||||
public static final ResourceLocation bobble_nos = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/nos.png");
|
||||
public static final ResourceLocation bobble_drillgon = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/drillgon200.png");
|
||||
public static final ResourceLocation bobble_cirno = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/cirno.png");
|
||||
|
||||
@Override
|
||||
@ -94,12 +93,14 @@ public class RenderBobble extends TileEntitySpecialRenderer {
|
||||
case UFFR: bindTexture(bobble_uffr); break;
|
||||
case VAER: bindTexture(bobble_vaer); break;
|
||||
case NOS: bindTexture(bobble_nos); break;
|
||||
case DRILLGON: bindTexture(bobble_drillgon); break;
|
||||
default: bindTexture(ResourceManager.universal);
|
||||
}
|
||||
|
||||
switch(type) {
|
||||
case PU238: renderPellet(type); break;
|
||||
case UFFR: renderFumo(type); break;
|
||||
case PU238: renderPellet(type); break;
|
||||
case UFFR: renderFumo(type); break;
|
||||
case DRILLGON: renderDrillgon(type); break;
|
||||
default: renderGuy(type);
|
||||
}
|
||||
|
||||
@ -354,6 +355,10 @@ public class RenderBobble extends TileEntitySpecialRenderer {
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
public void renderDrillgon(BobbleType type) {
|
||||
bobble.renderPart("Drillgon");
|
||||
}
|
||||
|
||||
private ModelUboinik shotgun = new ModelUboinik();
|
||||
private ResourceLocation shot_tex = new ResourceLocation(RefStrings.MODID +":textures/models/ModelUboinik.png");
|
||||
|
||||
@ -19,8 +19,6 @@ public class RenderIGenerator extends TileEntitySpecialRenderer {
|
||||
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float f) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
|
||||
|
||||
GL11.glTranslated(1, 0, 0);
|
||||
|
||||
switch(te.getBlockMetadata() - BlockDummyable.offset) {
|
||||
case 2: GL11.glRotatef(180, 0F, 1F, 0F); break;
|
||||
@ -28,6 +26,8 @@ public class RenderIGenerator extends TileEntitySpecialRenderer {
|
||||
case 3: GL11.glRotatef(0, 0F, 1F, 0F); break;
|
||||
case 5: GL11.glRotatef(90, 0F, 1F, 0F); break;
|
||||
}
|
||||
|
||||
GL11.glTranslated(0, 0, -1);
|
||||
|
||||
TileEntityMachineIGenerator igen = (TileEntityMachineIGenerator) te;
|
||||
|
||||
|
||||
@ -23,6 +23,8 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery {
|
||||
|
||||
if(!worldObj.isRemote) {
|
||||
|
||||
this.transmitPower();
|
||||
|
||||
power = Library.chargeTEFromItems(slots, 0, power, maxPower);
|
||||
power = Library.chargeItemsFromTE(slots, 1, power, maxPower);
|
||||
|
||||
@ -40,6 +42,12 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery {
|
||||
rotation -= 360;
|
||||
prevRotation -= 360;
|
||||
}
|
||||
|
||||
for(int i = 1; i < this.log.length; i++) {
|
||||
this.log[i - 1] = this.log[i];
|
||||
}
|
||||
|
||||
this.log[19] = this.power;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -210,7 +210,7 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory,
|
||||
if(!worldObj.isRemote) {
|
||||
|
||||
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
|
||||
this.sendPower(worldObj, xCoord, yCoord, zCoord, dir);
|
||||
this.sendPower(worldObj, xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir.getOpposite());
|
||||
|
||||
heat = 0;
|
||||
|
||||
|
||||
@ -374,7 +374,7 @@ public class TileEntityMachineReactorLarge extends TileEntity
|
||||
|
||||
private void generate() {
|
||||
|
||||
int consumption = (maxFuel / cycleDuration) * rods / 100;
|
||||
int consumption = (int) (((double)maxFuel / cycleDuration) * rods / 100);
|
||||
|
||||
if(consumption > fuel)
|
||||
consumption = fuel;
|
||||
@ -385,7 +385,7 @@ public class TileEntityMachineReactorLarge extends TileEntity
|
||||
fuel -= consumption;
|
||||
waste += consumption;
|
||||
|
||||
int heat = (consumption / size) * type.heat / fuelMult;
|
||||
int heat = (int) (((double)consumption / size) * type.heat / fuelMult);
|
||||
|
||||
this.coreHeat += heat;
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
BIN
src/main/resources/assets/hbm/textures/blocks/cluster_copper.png
Normal file
BIN
src/main/resources/assets/hbm/textures/blocks/cluster_copper.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 755 B |
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 980 B |
Binary file not shown.
|
After Width: | Height: | Size: 757 B |
Loading…
x
Reference in New Issue
Block a user