Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added API for Chemical Injection Chamber #90

Merged
merged 1 commit into from
Jan 29, 2023
Merged

Added API for Chemical Injection Chamber #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 41 additions & 0 deletions src/main/java/mekanism/api/gas/GasifyableItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package mekanism.api.gas;

import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;

public class GasifyableItems {

static HashMap<String, GasStack> gasifyableItems = new HashMap<String, GasStack>();
static List<Gas> validGases = new ArrayList<>();

public static void registerGasifyables(String oredict, Gas gas, Integer quantity) {
System.out.println("oredict = " + oredict);
System.out.println("gas = " + gas);
System.out.println("quantity = " + quantity);

GasStack gasifyEntry = new GasStack(gas, quantity);

gasifyableItems.put(oredict, gasifyEntry);
validGases.add(gas);
}

public static GasStack getGasFromItem(ItemStack itemstack) {

List<String> oredict = MekanismUtils.getOreDictName(itemstack);

for (String s : oredict) {
if (gasifyableItems.containsKey(s))
return gasifyableItems.get(s);
}
return null;
}

public static boolean isGasValidGasifyable(Gas gas) {
return validGases.contains(gas);
}
}
16 changes: 9 additions & 7 deletions src/main/java/mekanism/common/Mekanism.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@
import mekanism.api.MekanismConfig;
import mekanism.api.MekanismConfig.general;
import mekanism.api.MekanismConfig.usage;
import mekanism.api.gas.Gas;
import mekanism.api.gas.*;
import mekanism.api.gas.GasNetwork.GasTransferEvent;
import mekanism.api.gas.GasRegistry;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.OreGas;
import mekanism.api.infuse.InfuseObject;
import mekanism.api.infuse.InfuseRegistry;
import mekanism.api.infuse.InfuseType;
Expand Down Expand Up @@ -1440,14 +1437,19 @@ public void preInit(FMLPreInitializationEvent event)
FluidRegistry.registerFluid(new Fluid("heavyWater"));
FluidRegistry.registerFluid(new Fluid("steam").setGaseous(true));

for(Resource resource : Resource.values())
{
for(Resource resource : Resource.values()) {
String name = resource.getName();

OreGas clean = (OreGas)GasRegistry.register(new OreGas("clean" + name, "oregas." + name.toLowerCase()).setVisible(false));
OreGas clean = (OreGas) GasRegistry.register(new OreGas("clean" + name, "oregas." + name.toLowerCase()).setVisible(false));
GasRegistry.register(new OreGas(name.toLowerCase(), "oregas." + name.toLowerCase()).setCleanGas(clean).setVisible(false));
}

//Register Gasifyable Items
GasifyableItems.registerGasifyables("dustSulfur", GasRegistry.getGas("sulfuricAcid"), 2);
GasifyableItems.registerGasifyables("dustSalt", GasRegistry.getGas("hydrogenChloride"), 2);
GasifyableItems.registerGasifyables("dustSugar", GasRegistry.getGas("molasse"), 90);
GasifyableItems.registerGasifyables("listAllSugar", GasRegistry.getGas("molasse"), 90);

Mekanism.proxy.preInit();

//Register blocks and items
Expand Down
16 changes: 7 additions & 9 deletions src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@

import mekanism.api.EnumColor;
import mekanism.api.MekanismConfig.usage;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasRegistry;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.GasTransmission;
import mekanism.api.gas.IGasItem;
import mekanism.api.gas.*;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.MekanismBlocks;
import mekanism.common.SideData;
Expand Down Expand Up @@ -43,9 +39,11 @@ public Map getRecipes()
@Override
public GasStack getItemGas(ItemStack itemstack)
{
if(MekanismUtils.getOreDictName(itemstack).contains("dustSulfur")) return new GasStack(GasRegistry.getGas("sulfuricAcid"), 2);
if(MekanismUtils.getOreDictName(itemstack).contains("dustSalt")) return new GasStack(GasRegistry.getGas("hydrogenChloride"), 2);
if(MekanismUtils.getOreDictName(itemstack).contains("dustSugar") || MekanismUtils.getOreDictName(itemstack).contains("listAllSugar")) return new GasStack(GasRegistry.getGas("molasse"), 90);
if (GasifyableItems.getGasFromItem(itemstack) != null) {
System.out.println(GasifyableItems.getGasFromItem(itemstack).getGas().getUnlocalizedName());
return GasifyableItems.getGasFromItem(itemstack);
}
else
if(Block.getBlockFromItem(itemstack.getItem()) == MekanismBlocks.GasTank && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null &&
isValidGas(((IGasItem)itemstack.getItem()).getGas(itemstack).getGas())) return new GasStack(GasRegistry.getGas("sulfuricAcid"), 1);

Expand Down Expand Up @@ -102,7 +100,7 @@ public boolean canTubeConnect(ForgeDirection side)
@Override
public boolean isValidGas(Gas gas)
{
return gas == GasRegistry.getGas("sulfuricAcid") || gas == GasRegistry.getGas("water") || gas == GasRegistry.getGas("hydrogenChloride")|| gas == GasRegistry.getGas("molasse");
return (gas == GasRegistry.getGas("water") || GasifyableItems.isGasValidGasifyable(gas));
}

@Override
Expand Down