Anvilcraft/atomicscience
2
1
Fork 0
generated from tilera/1710mod
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: chemical extractor works with oredict

Browse source
This commit is contained in:
LordMZTE 2023-01-27 16:45:03 +01:00
parent 113cf7b024
commit ec110df6e6
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
5 changed files with 46 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/main/java/atomicscience/AtomicScience.java
View file

@ -67,10 +67,10 @@ import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import java.io.File;
import java.util.Arrays;
import java.util.logging.Logger;
import java.util.stream.Stream;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
@ -94,6 +94,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import org.apache.commons.lang3.ArrayUtils;
import universalelectricity.core.item.ItemElectric;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.TranslationHelper;
@ -108,8 +109,8 @@ import universalelectricity.prefab.ore.OreGenerator;
@Mod(modid = "AtomicScience", name = "Atomic Science", version = "1.1.0",
dependencies = "required-after:basiccomponents")
public class AtomicScience {
public static Configuration CONFIGURATION =
new Configuration(new File(Loader.instance().getConfigDir(), "AtomicScience.cfg"));
public static Configuration CONFIGURATION = new Configuration(
new File(Loader.instance().getConfigDir(), "AtomicScience.cfg"));
public static final String ID = "AtomicScience";
public static final String CHANNEL = "AtomicScience";
public static final String PREFIX = "atomicscience:";
@ -175,7 +176,8 @@ public class AtomicScience {
public static OreGenBase uraniumOreGeneration;
public static int URANIUM_HEXAFLOURIDE_RATIO = 200;
public static int STEAM_RATIO = 120;
public static final String QIZI_FAN_WU_SU_BAO_ZHA = FlagRegistry.registerFlag("ban_antimatter_power");
public static final String QIZI_FAN_WU_SU_BAO_ZHA =
FlagRegistry.registerFlag("ban_antimatter_power");
public static final Logger LOGGER = Logger.getLogger("AtomicScience");
public static SimpleNetworkWrapper channel;
@ -213,8 +215,11 @@ public class AtomicScience {
STEAM_RATIO =
AtomicScience.CONFIGURATION.get("general", "Steam Ratio", STEAM_RATIO)
.getInt(STEAM_RATIO);
REQUIRE_TRITIUM = AtomicScience.CONFIGURATION.get("general", "Require Tritium", REQUIRE_TRITIUM).getBoolean(REQUIRE_TRITIUM);
PotionRadiation.INSTANCE = new PotionRadiation(21, true, 5149489, "radiation");
REQUIRE_TRITIUM = AtomicScience.CONFIGURATION
.get("general", "Require Tritium", REQUIRE_TRITIUM)
.getBoolean(REQUIRE_TRITIUM);
PotionRadiation.INSTANCE =
new PotionRadiation(21, true, 5149489, "radiation");
blockRadioactive = (new BlockRadioactive()
.setBlockName("atomicscience:radioactive")
.setCreativeTab(TabAS.INSTANCE));
@ -227,7 +232,7 @@ public class AtomicScience {
bThermometer = new BThermometer();
bFusionReactor = new BFusionReactor();
bPlasma = new BPlasma();
bElectromagnet= new BElectromagnet();
bElectromagnet = new BElectromagnet();
bElectromagnetBoiler = new BElectromagnetBoiler();
bChemicalExtractor = new BChemicalExtractor();
bSiren = new BSiren();
@ -256,7 +261,7 @@ public class AtomicScience {
itCell = new ItCell("cellEmpty");
itCellUranium = new ItFissileFuel();
itCellDeuterium = new ItCell("cellDeuterium");
itCellTritium =new ItCell("cellTritium");
itCellTritium = new ItCell("cellTritium");
itCellStrangeMatter = new ItStrangeMatter();
itCellAntimatter = new ItAntimatterCell();
itCellWater = new ItCell("cellWater");
@ -308,8 +313,10 @@ public class AtomicScience {
GameRegistry.registerBlock(bThermometer, "bThermometer");
GameRegistry.registerBlock(bFusionReactor, "bFusionReactor");
GameRegistry.registerBlock(bPlasma, IBPlasma.class, "bPlasma");
GameRegistry.registerBlock(bElectromagnet, IBElectromagnet.class, "bElectromagnet");
GameRegistry.registerBlock(bElectromagnetBoiler, IBElectromagnet.class, "bElectromagnetBoiler");
GameRegistry.registerBlock(bElectromagnet, IBElectromagnet.class,
"bElectromagnet");
GameRegistry.registerBlock(bElectromagnetBoiler, IBElectromagnet.class,
"bElectromagnetBoiler");
GameRegistry.registerBlock(bChemicalExtractor, "bChemicalExtractor");
GameRegistry.registerBlock(bSiren, IBSiren.class, "bSiren");
GameRegistry.registerBlock(bElectromagnetGlass, "bElectromagnetGlass");
@ -375,7 +382,8 @@ public class AtomicScience {
GameRegistry.registerTileEntity(TTurbine.class, "ASTurbine");
GameRegistry.registerTileEntity(TNuclearBoiler.class, "ASNuclearBoiler");
GameRegistry.registerTileEntity(TThermometer.class, "ASThermometer");
GameRegistry.registerTileEntity(TElectromagnetBoiler.class, "ASElectromagnetBoiler");
GameRegistry.registerTileEntity(TElectromagnetBoiler.class,
"ASElectromagnetBoiler");
GameRegistry.registerTileEntity(TChemicalExtractor.class,
"ASChemicalExtractor");
GameRegistry.registerTileEntity(TFunnel.class, "ASFunnel");
@ -403,7 +411,8 @@ public class AtomicScience {
metadata.url = "https://git.tilera.org/Anvilcraft/atomicscience";
metadata.logoFile = "/as_logo.png";
metadata.version = "1.1.0";
metadata.authorList = Arrays.asList(new String[] {"Calclavia", "LordMZTE", "tilera"});
metadata.authorList =
Arrays.asList(new String[] {"Calclavia", "LordMZTE", "tilera"});
metadata.credits = "Please visit the website.";
metadata.logoFile = "as_logo.png";
metadata.autogenerated = false;
@ -475,16 +484,10 @@ public class AtomicScience {
public static boolean is(ItemStack itemStack, String... names) {
if (itemStack != null && names != null && names.length > 0) {
String name = OreDictionary.getOreName(OreDictionary.getOreID(itemStack));
String[] arr$ = names;
int len$ = names.length;
for (int i$ = 0; i$ < len$; ++i$) {
String compareName = arr$[i$];
if (name.equals(compareName)) {
return true;
}
}
int[] ids = OreDictionary.getOreIDs(itemStack);
return Stream.of(names)
.mapToInt(OreDictionary::getOreID)
.anyMatch(id -> ArrayUtils.contains(ids, id));
}
return false;
@ -531,16 +534,19 @@ public class AtomicScience {
}
}
@EventHandler
@EventHandler
public void serverStarting(FMLServerStartingEvent event) {
FlagRegistry.registerModFlag("ModFlags", new ModFlag(NBTFileLoader.loadData("ModFlags")));
event.registerServerCommand(new CommandFlag(FlagRegistry.getModFlag("ModFlags")));
FlagRegistry.registerModFlag(
"ModFlags", new ModFlag(NBTFileLoader.loadData("ModFlags")));
event.registerServerCommand(
new CommandFlag(FlagRegistry.getModFlag("ModFlags")));
}
@EventHandler
public void worldSave(Save evt) {
if (!evt.world.isRemote) {
NBTFileLoader.saveData("ModFlags", FlagRegistry.getModFlag("ModFlags").getNBT());
NBTFileLoader.saveData("ModFlags",
FlagRegistry.getModFlag("ModFlags").getNBT());
}
}

6
src/main/java/atomicscience/fenlie/TCentrifuge.java
View file

@ -15,6 +15,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.oredict.OreDictionary;
import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.item.ElectricItemHelper;
import universalelectricity.core.item.IItemElectric;
@ -130,10 +131,7 @@ public class TCentrifuge
public boolean canWork() {
return !this.isDisabled() && this.gasTank.getFluidAmount() != 0 &&
this.gasTank.getFluidAmount() >= AtomicScience.URANIUM_HEXAFLOURIDE_RATIO &&
this.isItemValidForSlot(2, new ItemStack(AtomicScience.itUranium)) &&
this.isItemValidForSlot(3,
new ItemStack(AtomicScience.itUranium, 1, 1));
this.gasTank.getFluidAmount() >= AtomicScience.URANIUM_HEXAFLOURIDE_RATIO;
}
public void work() {

2
src/main/java/atomicscience/hecheng/CChemicalExtractor.java
View file

@ -69,7 +69,7 @@ public class CChemicalExtractor extends Container {
if (!this.mergeItemStack(itemStack, 0, 1, false)) {
return null;
}
} else if (FluidRegistry.WATER == FluidContainerRegistry.getFluidForFilledItem(itemStack)
} else if (FluidContainerRegistry.getFluidForFilledItem(itemStack) != null && FluidRegistry.WATER == FluidContainerRegistry.getFluidForFilledItem(itemStack)
.getFluid()) {
if (!this.mergeItemStack(itemStack, 1, 2, false)) {
return null;

10
src/main/java/atomicscience/jiqi/TChemicalExtractor.java
View file

@ -209,6 +209,16 @@ public class TChemicalExtractor
@Override
public boolean isItemValidForSlot(int slotID, ItemStack itemStack) {
if (slotID == 2) {
if (this.getStackInSlot(2) == null)
return true;
if (!this.getStackInSlot(2).isItemEqual(itemStack))
return false;
return this.getStackInSlot(2).stackSize + itemStack.stackSize <= itemStack.getMaxStackSize();
}
return slotID == 1
? AtomicScience.isCellWater(itemStack)
: (slotID != 3 ? false

2
src/main/java/atomicscience/jiqi/TInventory.java
View file

@ -105,7 +105,7 @@ public abstract class TInventory
if (this.getStackInSlot(slot) == null) {
this.setInventorySlotContents(slot, itemStack.copy());
} else if (this.getStackInSlot(slot).isItemEqual(itemStack)) {
++this.getStackInSlot(slot).stackSize;
this.getStackInSlot(slot).stackSize += itemStack.stackSize;
}
}