Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Explicitly added some Solid Fuels to the Large Boiler Fuel tab.

Browse source 
I was unable to automatically add all fuels to the tab.
This commit is contained in:
Johannes Gäßler 2017-04-11 00:47:56 +02:00
parent 822cf1ec3e
commit 2064e0b12c
2 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/gregtech/GT_Mod.java
View file

@ -811,6 +811,9 @@ public class GT_Mod implements IGT_Mod {
GregTech_API.mInputRF = false;
}
}
addSolidFakeLargeBoilerFuels();
achievements = new GT_Achievements();
GT_Log.out.println("GT_Mod: Loading finished, deallocating temporary Init Variables.");
GregTech_API.sBeforeGTPreload = null;
@ -1105,4 +1108,29 @@ public class GT_Mod implements IGT_Mod {
public void doSonictronSound(ItemStack aStack, World aWorld, double aX, double aY, double aZ) {
gregtechproxy.doSonictronSound(aStack, aWorld, aX, aY, aZ);
}
private void addSolidFakeLargeBoilerFuels(){
GT_Recipe.GT_Recipe_Map.sLargeBoilerFakeFuels.addSolidRecipes(
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Charcoal, 1),
GT_OreDictUnificator.get(OrePrefixes.item, Materials.Charcoal, 1),
GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1),
GT_OreDictUnificator.get(OrePrefixes.item, Materials.Coal, 1),
GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1),
GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Coal, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lignite, 1),
GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1),
GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1),
GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Lignite, 1),
GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1),
GT_OreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 1),
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 1),
GT_OreDictUnificator.get(ItemList.Block_SSFUEL.get(1, new Object[0])),
GT_OreDictUnificator.get(ItemList.Block_MSSFUEL.get(1, new Object[0])),
new ItemStack(Items.lava_bucket),
new ItemStack(Items.blaze_rod));
}
}

18
src/main/java/gregtech/api/util/GT_Recipe.java
View file

@ -1381,6 +1381,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
public GT_Recipe_Map_Large_Boiler_Fake_Fuels(){
super(new HashSet<GT_Recipe>(30), "gt.recipe.largeboilerfakefuels", "Large Boiler", null, RES_PATH_GUI + "basicmachines/Default", 1, 0, 1, 0, 1, E, 1, E, true , true);
GT_Recipe explanatoryRecipe = new GT_Recipe(true, new ItemStack[]{}, new ItemStack[]{}, null, null, null, null, 1, 1, 1);
explanatoryRecipe.setNeiDesc("Not all solid fuels are listed.", "Any item that burns in a", "vanilla furnace will burn in", "a Large Boiler.");
addRecipe(explanatoryRecipe);
}
public GT_Recipe addDenseLiquidRecipe(GT_Recipe recipe) {
@ -1390,11 +1393,16 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
public GT_Recipe addDieselRecipe(GT_Recipe recipe) {
return addRecipe(recipe,((double)recipe.mSpecialValue) / 40);
}
public GT_Recipe addSolidRecipe(GT_Recipe recipe) {
return addRecipe(recipe, ((double)recipe.mSpecialValue) / 80);
public void addSolidRecipes(ItemStack ... itemStacks) {
for(ItemStack itemStack : itemStacks){
addSolidRecipe(itemStack);
}
}
public GT_Recipe addSolidRecipe(ItemStack fuelItemStack){
return addRecipe(new GT_Recipe(true, new ItemStack[]{fuelItemStack}, new ItemStack[]{}, null, null, null, null, 1, 0, GT_ModHandler.getFuelValue(fuelItemStack) / 1600), ((double)GT_ModHandler.getFuelValue(fuelItemStack)) / 1600);
}
private GT_Recipe addRecipe(GT_Recipe recipe, double baseBurnTime){
recipe = new GT_Recipe(recipe);
@ -1410,7 +1418,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
double tungstensteelBurnTime = baseBurnTime * 1.2 + floatErrorCorrection;
tungstensteelBurnTime -= tungstensteelBurnTime % 0.05;
recipe.setNeiDesc("Burn times in seconds:",
recipe.setNeiDesc("Burn time in seconds:",
String.format("Bronze Boiler: %.2f", bronzeBurnTime),
String.format("Steel Boiler: %.2f", steelBurnTime),
String.format("Titanium Boiler: %.2f", titaniumBurnTime),