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

memepackhunters.xxx

Browse Source
This commit is contained in:
Bob 2023-06-23 23:06:44 +02:00
parent bb15f50047
commit 00360a4586
8 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/hbm/blocks/generic/BlockGlyphidSpawner.java
View File

@ -4,9 +4,12 @@ import java.util.List;
import java.util.Random;
import com.hbm.entity.mob.EntityGlyphid;
import com.hbm.entity.mob.EntityGlyphidBehemoth;
import com.hbm.entity.mob.EntityGlyphidBlaster;
import com.hbm.entity.mob.EntityGlyphidBombardier;
import com.hbm.entity.mob.EntityGlyphidBrawler;
import com.hbm.entity.mob.EntityGlyphidBrenda;
import com.hbm.entity.mob.EntityGlyphidNuclear;
import com.hbm.entity.mob.EntityGlyphidScout;
import com.hbm.handler.pollution.PollutionHandler;
import com.hbm.handler.pollution.PollutionHandler.PollutionType;
@ -56,12 +59,13 @@ public class BlockGlyphidSpawner extends BlockContainer {
public EntityGlyphid createGlyphid(float soot) {
Random rand = new Random();
if(soot < 1) return rand.nextInt(5) == 0 ? new EntityGlyphidBombardier(worldObj) : new EntityGlyphid(worldObj);
if(soot < 10) return rand.nextInt(5) == 0 ? new EntityGlyphidBombardier(worldObj) : new EntityGlyphidBrawler(worldObj);
if(soot < 50) return rand.nextInt(5) == 0 ? new EntityGlyphidBlaster(worldObj) : new EntityGlyphidBehemoth(worldObj);
if(soot < 100) return rand.nextInt(5) == 0 ? new EntityGlyphidBlaster(worldObj) : new EntityGlyphidBrenda(worldObj);
if(soot < 1) {
return rand.nextInt(5) == 0 ? new EntityGlyphidBombardier(worldObj) : new EntityGlyphid(worldObj);
}
return rand.nextInt(5) == 0 ? new EntityGlyphidBlaster(worldObj) : new EntityGlyphidBrawler(worldObj);
return rand.nextInt(3) == 0 ? new EntityGlyphidBlaster(worldObj) : new EntityGlyphidNuclear(worldObj);
}
}
}

2
src/main/java/com/hbm/inventory/gui/GUICompressor.java
View File

@ -35,6 +35,8 @@ public class GUICompressor extends GuiInfoContainer {
compressor.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 17, guiTop + 18, 16, 52);
compressor.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 107, guiTop + 18, 16, 52);
this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 18, 16, 52, compressor.power, compressor.maxPower);
for(int j = 0; j < 5; j++) drawCustomInfoStat(mouseX, mouseY, guiLeft + 43 + j * 11, guiTop + 48, 8, 14, mouseX, mouseY, j + " PU -> " + (j + 1) + " PU");
}
@Override

8
src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java
View File

@ -985,6 +985,14 @@ public class AssemblerRecipes {
new ComparableStack(ModItems.motor, 1),
new ComparableStack(ModItems.circuit_red_copper, 3)
}, 200);
makeRecipe(new ComparableStack(ModBlocks.machine_compressor, 1), new AStack[] {
new OreDictStack(STEEL.plateCast(), 8),
new OreDictStack(CU.plate528(), 4),
new ComparableStack(ModItems.hull_big_steel, 2),
new ComparableStack(ModItems.motor, 3),
new ComparableStack(ModItems.circuit_red_copper, 1)
}, 200);
makeRecipe(new ComparableStack(ModItems.euphemium_capacitor, 1), new AStack[]
{

26
src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java
View File

@ -91,22 +91,22 @@ public class ChemplantRecipes extends SerializableRecipe {
new ComparableStack(ModItems.wire_schrabidium, 4),
new OreDictStack(DIAMOND.dust()),
new OreDictStack(DESH.ingot()))
.inputFluids(new FluidStack(Fluids.ACID, 800), new FluidStack(Fluids.MERCURY, 200))
.inputFluids(new FluidStack(Fluids.ACID, 800, GeneralConfig.enable528 ? 1 : 0), new FluidStack(Fluids.MERCURY, 200))
.outputItems(new ItemStack(ModItems.circuit_schrabidium)));
recipes.add(new ChemRecipe(43, "POLYMER", 100)
.inputItems(
new OreDictStack(COAL.dust(), 2),
new OreDictStack(F.dust()))
.inputFluids(new FluidStack(Fluids.PETROLEUM, 500))
.inputFluids(new FluidStack(Fluids.PETROLEUM, 500, GeneralConfig.enable528 ? 1 : 0))
.outputItems(new ItemStack(ModItems.ingot_polymer)));
recipes.add(new ChemRecipe(81, "BAKELITE", 100)
.inputFluids(
new FluidStack(Fluids.AROMATICS, 500),
new FluidStack(Fluids.PETROLEUM, 500))
new FluidStack(Fluids.AROMATICS, 500, GeneralConfig.enable528 ? 1 : 0),
new FluidStack(Fluids.PETROLEUM, 500, GeneralConfig.enable528 ? 1 : 0))
.outputItems(new ItemStack(ModItems.ingot_bakelite)));
recipes.add(new ChemRecipe(82, "RUBBER", 100)
.inputItems(new OreDictStack(S.dust()))
.inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500))
.inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500, GeneralConfig.enable528 ? 2 : 0))
.outputItems(new ItemStack(ModItems.ingot_rubber)));
/*recipes.add(new ChemRecipe(94, "PET", 100)
.inputItems(new OreDictStack(AL.dust()))
@ -126,14 +126,14 @@ public class ChemplantRecipes extends SerializableRecipe {
.outputItems(new ItemStack(com.hbm.blocks.ModBlocks.reinforced_laminate)));
recipes.add(new ChemRecipe(94, "PC", 100)
.inputFluids(
new FluidStack(Fluids.XYLENE, 500),
new FluidStack(Fluids.PHOSGENE, 500))
new FluidStack(Fluids.XYLENE, 500, GeneralConfig.enable528 ? 2 : 0),
new FluidStack(Fluids.PHOSGENE, 500, GeneralConfig.enable528 ? 2 : 0))
.outputItems(new ItemStack(ModItems.ingot_pc)));
recipes.add(new ChemRecipe(96, "PVC", 100)
.inputItems(new OreDictStack(CD.dust()))
.inputFluids(
new FluidStack(Fluids.UNSATURATEDS, 250),
new FluidStack(Fluids.CHLORINE, 250))
new FluidStack(Fluids.UNSATURATEDS, 250, GeneralConfig.enable528 ? 2 : 0),
new FluidStack(Fluids.CHLORINE, 250, GeneralConfig.enable528 ? 2 : 0))
.outputItems(new ItemStack(ModItems.ingot_pvc, 2)));
recipes.add(new ChemRecipe(89, "DYNAMITE", 50)
.inputItems(
@ -143,7 +143,7 @@ public class ChemplantRecipes extends SerializableRecipe {
.outputItems(new ItemStack(ModItems.ball_dynamite, 2)));
recipes.add(new ChemRecipe(83, "TNT", 150)
.inputItems(new OreDictStack(KNO.dust()))
.inputFluids(new FluidStack(Fluids.AROMATICS, 500))
.inputFluids(new FluidStack(Fluids.AROMATICS, 500, GeneralConfig.enable528 ? 1 : 0))
.outputItems(new ItemStack(ModItems.ball_tnt, 4)));
recipes.add(new ChemRecipe(95, "TATB", 50)
.inputItems(new ComparableStack(ModItems.ball_tnt))
@ -151,7 +151,7 @@ public class ChemplantRecipes extends SerializableRecipe {
.outputItems(new ItemStack(ModItems.ball_tatb)));
recipes.add(new ChemRecipe(84, "C4", 150)
.inputItems(new OreDictStack(KNO.dust()))
.inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500))
.inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500, GeneralConfig.enable528 ? 1 : 0))
.outputItems(new ItemStack(ModItems.ingot_c4, 4)));
//44, formerly deuterium
//45, formerly steam
@ -224,7 +224,7 @@ public class ChemplantRecipes extends SerializableRecipe {
new ComparableStack(ModItems.solid_fuel, 2),
new OreDictStack(KNO.dust()),
new OreDictStack(REDSTONE.dust()))
.inputFluids(new FluidStack(Fluids.PETROLEUM, 200))
.inputFluids(new FluidStack(Fluids.PETROLEUM, 200, GeneralConfig.enable528 ? 1 : 0))
.outputItems(new ItemStack(ModItems.rocket_fuel, 4)));
recipes.add(new ChemRecipe(58, "ELECTROLYSIS", 150)
.inputFluids(new FluidStack(Fluids.WATER, 8000))
@ -353,7 +353,7 @@ public class ChemplantRecipes extends SerializableRecipe {
new OreDictStack(F.dust(), 8),
new ComparableStack(ModItems.nugget_bismuth, 4))
.inputFluids(new FluidStack(Fluids.ACID, 1000, 5))
.outputFluids(new FluidStack(Fluids.DEATH, 1000)));
.outputFluids(new FluidStack(Fluids.DEATH, 1000, GeneralConfig.enable528 ? 5 : 0)));
//one bucket of ethanol equals 275_000 TU using the diesel baseline0
//the coal baseline is 400_000 per piece
//if we assume a burntime of 1.5 ops (300 ticks) for sugar at 100 TU/t that would equal a total of 30_000 TU

2
src/main/java/com/hbm/items/special/ItemTeleLink.java
View File

@ -42,7 +42,7 @@ public class ItemTeleLink extends Item {
if(!stack.hasTagCompound()) {
world.playSoundAtEntity(player, "hbm:item.techBoop", 1.0F, 1.0F);
player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "[TeleLink] No destiation set!"));
player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "[TeleLink] No destination set!"));
return false;
}

2
src/main/java/com/hbm/main/ModEventHandlerClient.java
View File

@ -1256,7 +1256,7 @@ public class ModEventHandlerClient {
switch(rand) {
case 0: main.splashText = "Floppenheimer!"; break;
case 1: main.splashText = "i should dip my balls in sulfuic acid"; break;
case 1: main.splashText = "i should dip my balls in sulfuric acid"; break;
case 2: main.splashText = "All answers are popbob!"; break;
case 3: main.splashText = "None shall enter The Orb!"; break;
case 4: main.splashText = "Wacarb was here"; break;

2
src/main/resources/assets/hbm/lang/de_DE.lang
View File

@ -332,6 +332,7 @@ container.machineBoiler=Ölwärmer
container.machineCMB=CMB-Stahl Hochofen
container.machineCoal=Verbrennungsgenerator
container.machineCoker=Koker-Anlage
container.machineCompressor=Kompressor
container.machineCrucible=Schmelztiegel
container.machineDiesel=Dieselgenerator
container.machineElectricBoiler=Elektrischer Ölwärmer
@ -3941,6 +3942,7 @@ tile.machine_coker.name=Koker-Anlage
tile.machine_coker.desc=Verkokt Öl, erzeugt fluides Nebenprodukt.$Benötigt externe Hitzequelle.$Wärmestransferrate: ΔT*0.025 TU/t
tile.machine_combine_factory.name=CMB-Stahl Hochofen
tile.machine_combustion_engine.name=Industrieller Verbrennungsmotor
tile.machine_compressor.name=Kompressor
tile.machine_condenser.name=Dampfkondensierer
tile.machine_controller.name=Reaktorfernsteuerung
tile.machine_converter_he_rf.name=HE zu RF Konverter

2
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -624,6 +624,7 @@ container.machineBoiler=Oil Heater
container.machineCMB=CMB Steel Furnace
container.machineCoal=Combustion Generator
container.machineCoker=Coker Unit
container.machineCompressor=Compressor
container.machineCrucible=Crucible
container.machineDiesel=Diesel Generator
container.machineElectricBoiler=Electric Oil Heater
@ -4764,6 +4765,7 @@ tile.machine_coker.name=Coker Unit
tile.machine_coker.desc=Cokes oil, creating fluid byproducts.$Requires external heat source.$Heat transfer rate: ΔT*0.025 TU/t
tile.machine_combine_factory.name=CMB Steel Furnace
tile.machine_combustion_engine.name=Industrial Combustion Engine
tile.machine_compressor.name=Compressor
tile.machine_condenser.name=Steam Condenser
tile.machine_controller.name=Reactor Remote Control Block
tile.machine_converter_he_rf.name=HE to RF Converter