almost forgot about this one

This commit is contained in:
Bob 2024-02-16 22:07:17 +01:00
parent efa790fe75
commit 65cda2b65b
9 changed files with 132 additions and 117 deletions

View File

@ -23,8 +23,7 @@ public class BoilerRecipeHandler extends TemplateRecipeHandler {
public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>(); public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();
public LinkedList<Class<? extends GuiContainer>> guiGui = new LinkedList<Class<? extends GuiContainer>>(); public LinkedList<Class<? extends GuiContainer>> guiGui = new LinkedList<Class<? extends GuiContainer>>();
public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe {
{
PositionedStack input; PositionedStack input;
PositionedStack result; PositionedStack result;
@ -70,8 +69,7 @@ public class BoilerRecipeHandler extends TemplateRecipeHandler {
if((outputId.equals("ntmboiler")) && getClass() == BoilerRecipeHandler.class) { if((outputId.equals("ntmboiler")) && getClass() == BoilerRecipeHandler.class) {
Map<Object, Object> recipes = MachineRecipes.instance().getBoilerRecipes(); Map<Object, Object> recipes = MachineRecipes.instance().getBoilerRecipes();
for(Map.Entry<Object, Object> recipe : recipes.entrySet()) { for(Map.Entry<Object, Object> recipe : recipes.entrySet()) {
this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(), this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue()));
(ItemStack)recipe.getValue()));
} }
} else { } else {
super.loadCraftingRecipes(outputId, results); super.loadCraftingRecipes(outputId, results);
@ -82,10 +80,8 @@ public class BoilerRecipeHandler extends TemplateRecipeHandler {
public void loadCraftingRecipes(ItemStack result) { public void loadCraftingRecipes(ItemStack result) {
Map<Object, Object> recipes = MachineRecipes.instance().getBoilerRecipes(); Map<Object, Object> recipes = MachineRecipes.instance().getBoilerRecipes();
for(Map.Entry<Object, Object> recipe : recipes.entrySet()) { for(Map.Entry<Object, Object> recipe : recipes.entrySet()) {
if (compareFluidStacks((ItemStack)recipe.getValue(), result) || if(compareFluidStacks((ItemStack) recipe.getValue(), result) || compareFluidStacks((ItemStack) recipe.getValue(), result))
compareFluidStacks((ItemStack)recipe.getValue(), result)) this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue()));
this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(),
(ItemStack)recipe.getValue()));
} }
} }
@ -103,8 +99,7 @@ public class BoilerRecipeHandler extends TemplateRecipeHandler {
Map<Object, Object> recipes = MachineRecipes.instance().getBoilerRecipes(); Map<Object, Object> recipes = MachineRecipes.instance().getBoilerRecipes();
for(Map.Entry<Object, Object> recipe : recipes.entrySet()) { for(Map.Entry<Object, Object> recipe : recipes.entrySet()) {
if(compareFluidStacks(ingredient, (ItemStack) recipe.getKey())) if(compareFluidStacks(ingredient, (ItemStack) recipe.getKey()))
this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(), this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue()));
(ItemStack)recipe.getValue()));
} }
} }

View File

@ -0,0 +1,16 @@
package com.hbm.handler.nei;
import com.hbm.blocks.ModBlocks;
import com.hbm.inventory.recipes.HydrotreatingRecipes;
public class HydrotreatingHandler extends NEIUniversalHandler {
public HydrotreatingHandler() {
super("Hydrotreating", ModBlocks.machine_hydrotreater, HydrotreatingRecipes.getRecipes());
}
@Override
public String getKey() {
return "ntmHydrotreating";
}
}

View File

@ -38,8 +38,8 @@ public class GUILaunchPadLarge extends GuiInfoContainer {
super.drawScreen(mouseX, mouseY, f); super.drawScreen(mouseX, mouseY, f);
this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 107, guiTop + 88 - 52, 16, 52, launchpad.power, launchpad.maxPower); this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 107, guiTop + 88 - 52, 16, 52, launchpad.power, launchpad.maxPower);
launchpad.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 125, guiTop + 70 - 52, 16, 52); launchpad.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 125, guiTop + 88 - 52, 16, 52);
launchpad.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 143, guiTop + 70 - 52, 16, 52); launchpad.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 143, guiTop + 88 - 52, 16, 52);
} }
@Override @Override

View File

@ -71,7 +71,7 @@ public class HydrotreatingRecipes extends SerializableRecipe {
for(Entry<FluidType, Triplet<FluidStack, FluidStack, FluidStack>> recipe : recipes.entrySet()) { for(Entry<FluidType, Triplet<FluidStack, FluidStack, FluidStack>> recipe : recipes.entrySet()) {
map.put(new ItemStack[] { map.put(new ItemStack[] {
ItemFluidIcon.make(recipe.getKey(), 1000), ItemFluidIcon.make(recipe.getKey(), 1000),
ItemFluidIcon.make(recipe.getValue().getX().type, recipe.getValue().getX().fill * 10) }, ItemFluidIcon.make(recipe.getValue().getX().type, recipe.getValue().getX().fill * 10, 1) },
new ItemStack[] { new ItemStack[] {
ItemFluidIcon.make(recipe.getValue().getY().type, recipe.getValue().getY().fill * 10), ItemFluidIcon.make(recipe.getValue().getY().type, recipe.getValue().getY().fill * 10),
ItemFluidIcon.make(recipe.getValue().getZ().type, recipe.getValue().getZ().fill * 10) }); ItemFluidIcon.make(recipe.getValue().getZ().type, recipe.getValue().getZ().fill * 10) });

View File

@ -35,6 +35,7 @@ public class ItemMissile extends ItemCustomLore {
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
list.add(EnumChatFormatting.ITALIC + this.tier.display); list.add(EnumChatFormatting.ITALIC + this.tier.display);
list.add("Fuel: " + this.fuel.display); list.add("Fuel: " + this.fuel.display);
if(this.fuelCap > 0) list.add("Fuel capacity: " + this.fuelCap + "mB");
super.addInformation(itemstack, player, list, bool); super.addInformation(itemstack, player, list, bool);
} }

View File

@ -42,6 +42,7 @@ public class NEIConfig implements IConfigureNEI {
registerHandler(new VacuumRecipeHandler()); registerHandler(new VacuumRecipeHandler());
registerHandler(new CrackingHandler()); registerHandler(new CrackingHandler());
registerHandler(new ReformingHandler()); registerHandler(new ReformingHandler());
registerHandler(new HydrotreatingHandler());
registerHandler(new BoilerRecipeHandler()); registerHandler(new BoilerRecipeHandler());
registerHandler(new ChemplantRecipeHandler()); registerHandler(new ChemplantRecipeHandler());
registerHandler(new CrystallizerRecipeHandler()); registerHandler(new CrystallizerRecipeHandler());

View File

@ -75,6 +75,7 @@ public class TileEntityLaunchPadLarge extends TileEntityLaunchPadBase implements
delay = 20; delay = 20;
} }
if(this.power >= 75_000) {
if(delay > 0) { if(delay > 0) {
delay--; delay--;
@ -133,6 +134,7 @@ public class TileEntityLaunchPadLarge extends TileEntityLaunchPadBase implements
} }
} }
} }
}
boolean prevLiftMoving = this.liftMoving; boolean prevLiftMoving = this.liftMoving;
boolean prevErectorMoving = this.erectorMoving; boolean prevErectorMoving = this.erectorMoving;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 10 KiB