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

ethanol

Browse Source
This commit is contained in:
Boblet 2021-11-04 08:55:55 +01:00
parent 6af3e1c066
commit 49369733f4
14 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/hbm/handler/FluidTypeHandler.java
View File

@ -95,8 +95,8 @@ public class FluidTypeHandler {
PLASMA_DH3 (0xFF83AA, 6, 2, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
HELIUM3 (0xFCF0C4, 7, 2, 2, 3, 4, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.helium3"),
DEATH (0x717A88, 8, 2, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2);
DEATH (0x717A88, 8, 2, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2),
ETHANOL (0xe0ffff, 9, 2, 2, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol");
//Approximate HEX Color of the fluid, used for pipe rendering
private int color;

1
src/main/java/com/hbm/inventory/FluidContainerRegistry.java
View File

@ -42,6 +42,7 @@ public class FluidContainerRegistry {
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_lightoil), new ItemStack(ModItems.canister_empty), FluidType.LIGHTOIL, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_kerosene), new ItemStack(ModItems.canister_empty), FluidType.KEROSENE, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_biofuel), new ItemStack(ModItems.canister_empty), FluidType.BIOFUEL, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_ethanol), new ItemStack(ModItems.canister_empty), FluidType.ETHANOL, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_gasoline), new ItemStack(ModItems.canister_empty), FluidType.GASOLINE, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_fracksol), new ItemStack(ModItems.canister_empty), FluidType.FRACKSOL, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_NITAN), new ItemStack(ModItems.canister_empty), FluidType.NITAN, 1000));

1
src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java
View File

@ -36,6 +36,7 @@ public class GUIMachineDiesel extends GuiInfoContainer {
" Diesel (500 HE/t)",
" Petroil (300 HE/t)",
" Biofuel (400 HE/t)",
" Ethanol (200 HE/t)",
" LPG (450 HE/t)",
" Hydrogen (10 HE/t)",
" Leaded Gasoline (1500 HE/t)",

6
src/main/java/com/hbm/inventory/recipes/MachineRecipes.java
View File

@ -1474,6 +1474,9 @@ public class MachineRecipes {
list.add(new ItemStack(ModItems.fluorite, 8));
list.add(new ItemStack(ModItems.nugget_bismuth, 4));
break;
case ETHANOL:
list.add(new ItemStack(ModItems.biomass, 6));
break;
default:
break;
}
@ -2033,6 +2036,9 @@ public class MachineRecipes {
case OSMIRIDIUM_DEATH:
output[0] = new FluidStack(1000, FluidType.DEATH);
break;
case ETHANOL:
output[0] = new FluidStack(1000, FluidType.ETHANOL);
break;
default:
break;
}

3
src/main/java/com/hbm/items/ModItems.java
View File

@ -812,6 +812,7 @@ public class ModItems {
public static Item canister_naphtha;
public static Item canister_lightoil;
public static Item canister_biofuel;
public static Item canister_ethanol;
public static Item gas_empty;
public static Item gas_full;
@ -3197,6 +3198,7 @@ public class ModItems {
canister_naphtha = new ItemCustomLore().setUnlocalizedName("canister_naphtha").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_naphtha");
canister_lightoil = new ItemCustomLore().setUnlocalizedName("canister_lightoil").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_lightoil");
canister_biofuel = new ItemCustomLore().setUnlocalizedName("canister_biofuel").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_biofuel");
canister_ethanol = new ItemCustomLore().setUnlocalizedName("canister_ethanol").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_ethanol");
gas_empty = new Item().setUnlocalizedName("gas_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":gas_empty");
gas_full = new Item().setUnlocalizedName("gas_full").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_full");
gas_petroleum = new Item().setUnlocalizedName("gas_petroleum").setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_petroleum");
@ -6137,6 +6139,7 @@ public class ModItems {
GameRegistry.registerItem(canister_reoil, canister_reoil.getUnlocalizedName());
GameRegistry.registerItem(canister_petroil, canister_petroil.getUnlocalizedName());
GameRegistry.registerItem(canister_biofuel, canister_biofuel.getUnlocalizedName());
GameRegistry.registerItem(canister_ethanol, canister_ethanol.getUnlocalizedName());
GameRegistry.registerItem(canister_napalm, canister_napalm.getUnlocalizedName());
GameRegistry.registerItem(canister_gasoline, canister_gasoline.getUnlocalizedName());
GameRegistry.registerItem(canister_fracksol, canister_fracksol.getUnlocalizedName());

5
src/main/java/com/hbm/items/machine/ItemChemistryTemplate.java
View File

@ -104,7 +104,8 @@ public class ItemChemistryTemplate extends Item {
GASOLINE,
FRACKSOL,
HELIUM3,
OSMIRIDIUM_DEATH;
OSMIRIDIUM_DEATH,
ETHANOL;
public static EnumChemistryTemplate getEnum(int i) {
if(i < EnumChemistryTemplate.values().length)
@ -306,6 +307,8 @@ public class ItemChemistryTemplate extends Item {
return 200;
case OSMIRIDIUM_DEATH:
return 240;
case ETHANOL:
return 50;
default:
return 100;
}

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java
View File

@ -154,6 +154,8 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IS
return 5000;
if(type.name().equals(FluidType.LPG.name()))
return 450;
if(type.name().equals(FluidType.ETHANOL.name()))
return 200;
return 0;
}

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

@ -127,6 +127,7 @@ chem.DYN_DNT=Dineutronium-Dynosynthese
chem.DYN_EUPH=Euphemium-Dynosynthese
chem.DYN_SCHRAB=Schrabidium-Dynosynthese
chem.ELECTROLYSIS=Kryo-Elektrolyse
chem.ETHANOL=Ethanolherstellung
chem.FC_BITUMEN=Bitumen-Cracking
chem.FC_DIESEL_KEROSENE=Diesel-Cracking
chem.FC_GAS_PETROLEUM=Erdgas-Cracking
@ -441,6 +442,7 @@ hbmfluid.cryogel=Kryogel
hbmfluid.death=Osmiridiumlösung
hbmfluid.deuterium=Deuterium
hbmfluid.diesel=Diesel
hbmfluid.ethanol=Ethanol
hbmfluid.fracksol=Frackinglösung
hbmfluid.gas=Erdgas
hbmfluid.gasoline=Bleibenzin
@ -889,6 +891,7 @@ item.canister_biofuel.name=Biodieselkanister
item.canister_bitumen.name=Bitumenkanister
item.canister_canola.name=Schmiermittelkanister
item.canister_empty.name=Leerer Kanister
item.canister_ethanol.name=Ethanolkanister
item.canister_fracksol.name=Frackinglösungskanister
item.canister_fuel.name=Dieselkanister
item.canister_gasoline.name=Bleibenzinkanister

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

@ -195,6 +195,7 @@ chem.DYN_DNT=Dineutronium Dynosynthesis
chem.DYN_EUPH=Euphemium Dynosynthesis
chem.DYN_SCHRAB=Schrabidium Dynosynthesis
chem.ELECTROLYSIS=Cryo-Electrolysis
chem.ETHANOL=Ethanol Production
chem.FC_BITUMEN=Bitumen Cracking
chem.FC_DIESEL_KEROSENE=Diesel Cracking
chem.FC_GAS_PETROLEUM=Gas Cracking
@ -509,6 +510,7 @@ hbmfluid.cryogel=Cryogel
hbmfluid.death=Osmiridic Solution
hbmfluid.deuterium=Deuterium
hbmfluid.diesel=Diesel
hbmfluid.ethanol=Ethanol
hbmfluid.fracksol=Fracking Solution
hbmfluid.gas=Natural Gas
hbmfluid.gasoline=Leaded Gasoline
@ -957,6 +959,7 @@ item.canister_biofuel.name=Biofuel Canister
item.canister_bitumen.name=Bitumen Canister
item.canister_canola.name=Engine Lubricant
item.canister_empty.name=Empty Canister
item.canister_ethanol.name=Ethanol Canister
item.canister_fracksol.name=Fracking Solution Canister
item.canister_fuel.name=Diesel Canister
item.canister_gasoline.name=Leaded Gasoline Canister

BIN
src/main/resources/assets/hbm/textures/gui/fluids2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
src/main/resources/assets/hbm/textures/items/canister_ethanol.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 563 B

BIN
src/main/resources/assets/hbm/textures/items/chem_icon_ETHANOL.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 349 B

BIN
src/main/resources/assets/hbm/textures/models/tank_ETHANOL.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

2
src/main/resources/mcmod.info
View File

@ -8,7 +8,7 @@
"url": "",
"updateUrl": "",
"authorList": ["HbMinecraft"],
"credits": "rodolphito (explosion algorithms), grangerave (explosion algorithms), Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models, porting), UFFR (fork with all sorts of features), Bismarck (chinese localization), FirzzleFrazzle (models), Minecreep (models), VT-6/24 (models, textures), PheodoreKaczynski (textures), Vær (fibrosis code), Adam29 (liquid petroleum), Pashtet (russian localization), Sten89 (models), Pixelguru26 (textures), impbk2002 (project settings), OvermindDL1 (project settings), TehTemmie (reacher radiation function)",
"credits": "rodolphito (explosion algorithms), grangerave (explosion algorithms), Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models, porting), UFFR (fork with all sorts of features), Pu-238 (Tom impact effects), Bismarck (chinese localization), FirzzleFrazzle (models), Minecreep (models), VT-6/24 (models, textures), PheodoreKaczynski (textures), Vær (fibrosis code), Adam29 (liquid petroleum, ethanol), Pashtet (russian localization), Sten89 (models), Pixelguru26 (textures), impbk2002 (project settings), OvermindDL1 (project settings), TehTemmie (reacher radiation function)",
"logoFile": "",
"screenshots": [],
"dependencies": []