fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Memoize isModLoaded lookups

Browse Source
This commit is contained in:
NotMyWing
2024-06-07 17:09:18 +11:00
parent 68de8fa1a2
commit f7562db2e9
12 changed files with 101 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+2 -9
View File
@@ -54,19 +54,12 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.Constants;
import net.minecraftforge.fml.common.Loader;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
import java.awt.*; import java.awt.*;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.*;
import java.util.Set;
import java.util.WeakHashMap;
import static appeng.client.render.BlockPosHighlighter.hilightBlock; import static appeng.client.render.BlockPosHighlighter.hilightBlock;
import static appeng.helpers.ItemStackHelper.stackFromNBT; import static appeng.helpers.ItemStackHelper.stackFromNBT;
@@ -116,7 +109,7 @@ public class GuiInterfaceTerminal extends AEBaseGui {
this.setScrollBar(scrollbar); this.setScrollBar(scrollbar);
this.xSize = 208; this.xSize = 208;
this.ySize = 255; this.ySize = 255;
this.jeiEnabled = Loader.isModLoaded("jei"); this.jeiEnabled = Platform.isModLoaded("jei");
this.jeiButtonPadding = jeiEnabled ? 22 : 0; this.jeiButtonPadding = jeiEnabled ? 22 : 0;
searchFieldInputs = createTextField(86, 12, ButtonToolTips.SearchFieldInputs.getLocal()); searchFieldInputs = createTextField(86, 12, ButtonToolTips.SearchFieldInputs.getLocal());
src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
+3 -9
View File
@@ -31,11 +31,7 @@ import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigurableObject; import appeng.api.util.IConfigurableObject;
import appeng.client.ActionKey; import appeng.client.ActionKey;
import appeng.client.gui.AEBaseMEGui; import appeng.client.gui.AEBaseMEGui;
import appeng.client.gui.widgets.GuiImgButton; import appeng.client.gui.widgets.*;
import appeng.client.gui.widgets.GuiScrollbar;
import appeng.client.gui.widgets.GuiTabButton;
import appeng.client.gui.widgets.ISortSource;
import appeng.client.gui.widgets.MEGuiTextField;
import appeng.client.me.InternalSlotME; import appeng.client.me.InternalSlotME;
import appeng.client.me.ItemRepo; import appeng.client.me.ItemRepo;
import appeng.client.me.SlotME; import appeng.client.me.SlotME;
@@ -61,7 +57,6 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Loader;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
@@ -103,7 +98,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
private int currentMouseY = 0; private int currentMouseY = 0;
private boolean delayedUpdate; private boolean delayedUpdate;
protected int jeiOffset = Loader.isModLoaded("jei") ? 24 : 0; protected int jeiOffset = Platform.isModLoaded("jei") ? 24 : 0;
public GuiMEMonitorable(final InventoryPlayer inventoryPlayer, final ITerminalHost te) { public GuiMEMonitorable(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
this(inventoryPlayer, te, new ContainerMEMonitorable(inventoryPlayer, te)); this(inventoryPlayer, te, new ContainerMEMonitorable(inventoryPlayer, te));
@@ -177,10 +172,9 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
NetworkHandler.instance().sendToServer(new PacketSwitchGuis(GuiBridge.GUI_CRAFTING_STATUS)); NetworkHandler.instance().sendToServer(new PacketSwitchGuis(GuiBridge.GUI_CRAFTING_STATUS));
} }
if (btn instanceof GuiImgButton) { if (btn instanceof GuiImgButton iBtn) {
final boolean backwards = Mouse.isButtonDown(1); final boolean backwards = Mouse.isButtonDown(1);
final GuiImgButton iBtn = (GuiImgButton) btn;
if (iBtn.getSetting() != Settings.ACTIONS) { if (iBtn.getSetting() != Settings.ACTIONS) {
final Enum cv = iBtn.getCurrentValue(); final Enum cv = iBtn.getCurrentValue();
final Enum next = Platform.rotateEnum(cv, backwards, iBtn.getSetting().getPossibleValues()); final Enum next = Platform.rotateEnum(cv, backwards, iBtn.getSetting().getPossibleValues());
src/main/java/appeng/container/implementations/ContainerMEMonitorable.java
+1 -3
View File
@@ -46,7 +46,6 @@ import appeng.api.util.IConfigurableObject;
import appeng.client.gui.implementations.GuiMEMonitorable; import appeng.client.gui.implementations.GuiMEMonitorable;
import appeng.container.AEBaseContainer; import appeng.container.AEBaseContainer;
import appeng.container.guisync.GuiSync; import appeng.container.guisync.GuiSync;
import appeng.container.slot.AppEngSlot;
import appeng.container.slot.SlotPlayerHotBar; import appeng.container.slot.SlotPlayerHotBar;
import appeng.container.slot.SlotPlayerInv; import appeng.container.slot.SlotPlayerInv;
import appeng.container.slot.SlotRestrictedInput; import appeng.container.slot.SlotRestrictedInput;
@@ -66,7 +65,6 @@ import net.minecraft.inventory.IContainerListener;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@@ -89,7 +87,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
private IConfigManagerHost gui; private IConfigManagerHost gui;
private IConfigManager serverCM; private IConfigManager serverCM;
private IGridNode networkNode; private IGridNode networkNode;
protected int jeiOffset = Loader.isModLoaded("jei") ? 24 : 0; protected int jeiOffset = Platform.isModLoaded("jei") ? 24 : 0;
public ContainerMEMonitorable(final InventoryPlayer ip, final ITerminalHost monitorable) { public ContainerMEMonitorable(final InventoryPlayer ip, final ITerminalHost monitorable) {
src/main/java/appeng/container/implementations/ContainerSecurityStation.java
+4 -6
View File
@@ -30,13 +30,13 @@ import appeng.container.slot.SlotOutput;
import appeng.container.slot.SlotRestrictedInput; import appeng.container.slot.SlotRestrictedInput;
import appeng.tile.inventory.AppEngInternalInventory; import appeng.tile.inventory.AppEngInternalInventory;
import appeng.tile.misc.TileSecurityStation; import appeng.tile.misc.TileSecurityStation;
import appeng.util.Platform;
import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation; import appeng.util.inv.InvOperation;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IContainerListener;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
@@ -53,7 +53,7 @@ public class ContainerSecurityStation extends ContainerMEMonitorable implements
@GuiSync(0) @GuiSync(0)
public int permissionMode = 0; public int permissionMode = 0;
protected int jeiOffset = Loader.isModLoaded("jei") ? 24 : 0; protected int jeiOffset = Platform.isModLoaded("jei") ? 24 : 0;
public ContainerSecurityStation(final InventoryPlayer ip, final ITerminalHost monitorable) { public ContainerSecurityStation(final InventoryPlayer ip, final ITerminalHost monitorable) {
super(ip, monitorable, false); super(ip, monitorable, false);
@@ -75,8 +75,7 @@ public class ContainerSecurityStation extends ContainerMEMonitorable implements
final SecurityPermissions permission = SecurityPermissions.valueOf(value); final SecurityPermissions permission = SecurityPermissions.valueOf(value);
final ItemStack a = this.configSlot.getStack(); final ItemStack a = this.configSlot.getStack();
if (!a.isEmpty() && a.getItem() instanceof IBiometricCard) { if (!a.isEmpty() && a.getItem() instanceof IBiometricCard bc) {
final IBiometricCard bc = (IBiometricCard) a.getItem();
if (bc.hasPermission(a, permission)) { if (bc.hasPermission(a, permission)) {
bc.removePermission(a, permission); bc.removePermission(a, permission);
} else { } else {
@@ -95,8 +94,7 @@ public class ContainerSecurityStation extends ContainerMEMonitorable implements
this.setPermissionMode(0); this.setPermissionMode(0);
final ItemStack a = this.configSlot.getStack(); final ItemStack a = this.configSlot.getStack();
if (!a.isEmpty() && a.getItem() instanceof IBiometricCard) { if (!a.isEmpty() && a.getItem() instanceof IBiometricCard bc) {
final IBiometricCard bc = (IBiometricCard) a.getItem();
for (final SecurityPermissions sp : bc.getPermissions(a)) { for (final SecurityPermissions sp : bc.getPermissions(a)) {
this.setPermissionMode(this.getPermissionMode() | (1 << sp.ordinal())); this.setPermissionMode(this.getPermissionMode() | (1 << sp.ordinal()));
src/main/java/appeng/container/slot/SlotCraftingTerm.java
+4 -13
View File
@@ -41,9 +41,6 @@ import appeng.util.inv.WrapperCursorItemHandler;
import appeng.util.inv.WrapperInvItemHandler; import appeng.util.inv.WrapperInvItemHandler;
import appeng.util.item.AEItemStack; import appeng.util.item.AEItemStack;
import com.blamejared.recipestages.recipes.RecipeStage; import com.blamejared.recipestages.recipes.RecipeStage;
import net.darkhax.gamestages.GameStageHelper;
import net.darkhax.itemstages.ItemStages;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@@ -53,9 +50,6 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import java.util.ArrayList; import java.util.ArrayList;
@@ -157,8 +151,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot {
// TODO: This is really hacky and NEEDS to be solved with a full container/gui refactoring. // TODO: This is really hacky and NEEDS to be solved with a full container/gui refactoring.
protected IRecipe findRecipe(InventoryCrafting ic, World world, EntityPlayer player) { protected IRecipe findRecipe(InventoryCrafting ic, World world, EntityPlayer player) {
if (this.container instanceof ContainerCraftingTerm) { if (this.container instanceof ContainerCraftingTerm containerTerminal) {
final ContainerCraftingTerm containerTerminal = (ContainerCraftingTerm) this.container;
final IRecipe recipe = containerTerminal.getCurrentRecipe(); final IRecipe recipe = containerTerminal.getCurrentRecipe();
if (recipe != null && recipe.matches(ic, world)) { if (recipe != null && recipe.matches(ic, world)) {
@@ -171,9 +164,8 @@ public class SlotCraftingTerm extends AppEngCraftingSlot {
// Returns null in case this recipe is not yet unlocked // Returns null in case this recipe is not yet unlocked
private IRecipe handleRecipe(InventoryCrafting ic, IRecipe recipe, EntityPlayer player) { private IRecipe handleRecipe(InventoryCrafting ic, IRecipe recipe, EntityPlayer player) {
if (Loader.isModLoaded("recipestages")) { if (Platform.isModLoaded("recipestages")) {
if (recipe instanceof RecipeStage) { if (recipe instanceof RecipeStage staged) {
final RecipeStage staged = (RecipeStage) recipe;
if (!staged.isGoodForCrafting(ic)) if (!staged.isGoodForCrafting(ic))
return null; return null;
} }
@@ -185,8 +177,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot {
// TODO: This is really hacky and NEEDS to be solved with a full container/gui refactoring. // TODO: This is really hacky and NEEDS to be solved with a full container/gui refactoring.
@Override @Override
protected NonNullList<ItemStack> getRemainingItems(InventoryCrafting ic, World world) { protected NonNullList<ItemStack> getRemainingItems(InventoryCrafting ic, World world) {
if (this.container instanceof ContainerCraftingTerm) { if (this.container instanceof ContainerCraftingTerm containerTerminal) {
final ContainerCraftingTerm containerTerminal = (ContainerCraftingTerm) this.container;
final IRecipe recipe = containerTerminal.getCurrentRecipe(); final IRecipe recipe = containerTerminal.getCurrentRecipe();
if (recipe != null && recipe.matches(ic, world)) { if (recipe != null && recipe.matches(ic, world)) {
src/main/java/appeng/core/sync/packets/PacketTerminalUse.java
+1 -2
View File
@@ -14,7 +14,6 @@ import io.netty.buffer.Unpooled;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.Optional;
public class PacketTerminalUse extends AppEngPacket { public class PacketTerminalUse extends AppEngPacket {
@@ -45,7 +44,7 @@ public class PacketTerminalUse extends AppEngPacket {
} }
} }
if (Loader.isModLoaded("baubles")) { if (Platform.isModLoaded("baubles")) {
tryOpenBauble(player); tryOpenBauble(player);
} }
} }
src/main/java/appeng/helpers/DualityInterface.java
+11 -11
View File
@@ -65,7 +65,10 @@ import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.tile.inventory.AppEngInternalInventory; import appeng.tile.inventory.AppEngInternalInventory;
import appeng.tile.inventory.AppEngInternalOversizedInventory; import appeng.tile.inventory.AppEngInternalOversizedInventory;
import appeng.tile.networking.TileCableBus; import appeng.tile.networking.TileCableBus;
import appeng.util.*; import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
import appeng.util.inv.*; import appeng.util.inv.*;
import appeng.util.item.AEItemStack; import appeng.util.item.AEItemStack;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
@@ -88,7 +91,6 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.RangedWrapper; import net.minecraftforge.items.wrapper.RangedWrapper;
@@ -98,7 +100,8 @@ import java.util.*;
import static appeng.api.config.LockCraftingMode.LOCK_UNTIL_PULSE; import static appeng.api.config.LockCraftingMode.LOCK_UNTIL_PULSE;
import static appeng.api.config.LockCraftingMode.LOCK_UNTIL_RESULT; import static appeng.api.config.LockCraftingMode.LOCK_UNTIL_RESULT;
import static appeng.helpers.ItemStackHelper.*; import static appeng.helpers.ItemStackHelper.stackFromNBT;
import static appeng.helpers.ItemStackHelper.stackToNBT;
public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost { public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost {
@@ -525,8 +528,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
return; return;
} }
if (is.getItem() instanceof ICraftingPatternItem) { if (is.getItem() instanceof ICraftingPatternItem cpi) {
final ICraftingPatternItem cpi = (ICraftingPatternItem) is.getItem();
final ICraftingPatternDetails details = cpi.getPatternForItem(is, this.iHost.getTileEntity().getWorld()); final ICraftingPatternDetails details = cpi.getPatternForItem(is, this.iHost.getTileEntity().getWorld());
if (details != null) { if (details != null) {
@@ -1068,8 +1070,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
continue; continue;
} }
if (te instanceof ICraftingMachine) { if (te instanceof ICraftingMachine cm) {
final ICraftingMachine cm = (ICraftingMachine) te;
if (cm.acceptsPlans()) { if (cm.acceptsPlans()) {
visitedFaces.remove(s); visitedFaces.remove(s);
if (cm.pushPattern(patternDetails, table, s.getOpposite())) { if (cm.pushPattern(patternDetails, table, s.getOpposite())) {
@@ -1084,7 +1085,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
if (ad != null) { if (ad != null) {
if (this.isBlocking()) { if (this.isBlocking()) {
IPhantomTile phantomTE; IPhantomTile phantomTE;
if (Loader.isModLoaded("actuallyadditions") && te instanceof IPhantomTile) { if (Platform.isModLoaded("actuallyadditions") && te instanceof IPhantomTile) {
phantomTE = ((IPhantomTile) te); phantomTE = ((IPhantomTile) te);
if (phantomTE.hasBoundPosition()) { if (phantomTE.hasBoundPosition()) {
TileEntity phantom = w.getTileEntity(phantomTE.getBoundPosition()); TileEntity phantom = w.getTileEntity(phantomTE.getBoundPosition());
@@ -1224,8 +1225,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
final InventoryAdaptor ad = InventoryAdaptor.getAdaptor(te, s.getOpposite()); final InventoryAdaptor ad = InventoryAdaptor.getAdaptor(te, s.getOpposite());
if (ad != null) { if (ad != null) {
if (Loader.isModLoaded("actuallyadditions") && Platform.GTLoaded && te instanceof IPhantomTile) { if (Platform.isModLoaded("actuallyadditions") && Platform.GTLoaded && te instanceof IPhantomTile phantomTE) {
IPhantomTile phantomTE = ((IPhantomTile) te);
if (phantomTE.hasBoundPosition()) { if (phantomTE.hasBoundPosition()) {
TileEntity phantom = w.getTileEntity(phantomTE.getBoundPosition()); TileEntity phantom = w.getTileEntity(phantomTE.getBoundPosition());
if (NonBlockingItems.INSTANCE.getMap().containsKey(w.getBlockState(phantomTE.getBoundPosition()).getBlock().getRegistryName().getNamespace())) { if (NonBlockingItems.INSTANCE.getMap().containsKey(w.getBlockState(phantomTE.getBoundPosition()).getBlock().getRegistryName().getNamespace())) {
@@ -1453,7 +1453,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
public long getSortValue() { public long getSortValue() {
final TileEntity te = this.iHost.getTileEntity(); final TileEntity te = this.iHost.getTileEntity();
return (te.getPos().getZ() << 24) ^ (te.getPos().getX() << 8) ^ te.getPos().getY(); return ((long) te.getPos().getZ() << 24) ^ ((long) te.getPos().getX() << 8) ^ te.getPos().getY();
} }
public void initialize() { public void initialize() {
src/main/java/appeng/helpers/NonBlockingItems.java
+55 -58
View File
@@ -9,7 +9,6 @@ import it.unimi.dsi.fastutil.ints.IntSet;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
@@ -24,65 +23,30 @@ public class NonBlockingItems {
private NonBlockingItems() { private NonBlockingItems() {
String[] strings = AEConfig.instance().getNonBlockingItems(); String[] strings = AEConfig.instance().getNonBlockingItems();
String[] modids = new String[0]; String[] modids = new String[0];
if (strings.length > 0) { for (String s : strings) {
for (String s : strings) { if (s.startsWith("[") && s.endsWith("]")) {
if (s.startsWith("[") && s.endsWith("]")) { modids = s.substring(1, s.length() - 1).split("\\|");
modids = s.substring(1, s.length() - 1).split("\\|"); } else {
} else { for (String modid : modids) {
for (String modid : modids) { if (!Platform.isModLoaded(modid)) {
if (!Loader.isModLoaded(modid)) { continue;
continue; }
} NON_BLOCKING_MAP.putIfAbsent(modid, new Object2ObjectOpenHashMap<>());
NON_BLOCKING_MAP.putIfAbsent(modid, new Object2ObjectOpenHashMap<>());
String[] ModItemMeta = s.split(":"); String[] ModItemMeta = s.split(":");
if (ModItemMeta.length < 2 || ModItemMeta.length > 3) { if (ModItemMeta.length < 2 || ModItemMeta.length > 3) {
AELog.error("Invalid non blocking item entry: " + s); AELog.error("Invalid non blocking item entry: " + s);
continue; continue;
} }
if (ModItemMeta[0].equals("gregtech") && Platform.GTLoaded) { if (ModItemMeta[0].equals("gregtech") && Platform.GTLoaded) {
boolean found = false; boolean found = false;
for (MetaItem<?> metaItem : MetaItem.getMetaItems()) { for (MetaItem<?> metaItem : MetaItem.getMetaItems()) {
MetaItem<?>.MetaValueItem metaItem2 = metaItem.getItem(ModItemMeta[1]); MetaItem<?>.MetaValueItem metaItem2 = metaItem.getItem(ModItemMeta[1]);
if (metaItem.getItem(ModItemMeta[1]) != null) { if (metaItem.getItem(ModItemMeta[1]) != null) {
found = true; found = true;
ItemStack itemStack = metaItem2.getStackForm(); ItemStack itemStack = metaItem2.getStackForm();
NON_BLOCKING_MAP.get(modid).putIfAbsent(itemStack.getItem(), new IntOpenHashSet());
NON_BLOCKING_MAP.get(modid).computeIfPresent(itemStack.getItem(), (item, intSet) ->
{
intSet.add(itemStack.getItemDamage());
return intSet;
});
} else {
ItemStack itemStack = GameRegistry.makeItemStack(ModItemMeta[0] + ":" + ModItemMeta[1], ModItemMeta.length == 3 ? Integer.parseInt(ModItemMeta[2]) : 0, 1, null);
if (!itemStack.isEmpty()) {
NON_BLOCKING_MAP.get(modid).putIfAbsent(itemStack.getItem(), new IntOpenHashSet());
NON_BLOCKING_MAP.get(modid).computeIfPresent(itemStack.getItem(), (item, intSet) ->
{
intSet.add(itemStack.getItemDamage());
return intSet;
});
}
}
}
if (!found) {
AELog.error("Item not found on nonBlocking config: " + s);
}
} else if (ModItemMeta[0].equals("ore")) {
OreDictionary.getOres(ModItemMeta[1]).forEach(itemStack ->
{
NON_BLOCKING_MAP.get(modid).putIfAbsent(itemStack.getItem(), new IntOpenHashSet());
NON_BLOCKING_MAP.get(modid).computeIfPresent(itemStack.getItem(), (item, intSet) ->
{
intSet.add(itemStack.getItemDamage());
return intSet;
});
});
} else {
ItemStack itemStack = GameRegistry.makeItemStack(ModItemMeta[0] + ":" + ModItemMeta[1], ModItemMeta.length == 3 ? Integer.parseInt(ModItemMeta[2]) : 0, 1, null);
if (!itemStack.isEmpty()) {
NON_BLOCKING_MAP.get(modid).putIfAbsent(itemStack.getItem(), new IntOpenHashSet()); NON_BLOCKING_MAP.get(modid).putIfAbsent(itemStack.getItem(), new IntOpenHashSet());
NON_BLOCKING_MAP.get(modid).computeIfPresent(itemStack.getItem(), (item, intSet) -> NON_BLOCKING_MAP.get(modid).computeIfPresent(itemStack.getItem(), (item, intSet) ->
{ {
@@ -90,9 +54,42 @@ public class NonBlockingItems {
return intSet; return intSet;
}); });
} else { } else {
AELog.error("Item not found on nonBlocking config: " + s); ItemStack itemStack = GameRegistry.makeItemStack(ModItemMeta[0] + ":" + ModItemMeta[1], ModItemMeta.length == 3 ? Integer.parseInt(ModItemMeta[2]) : 0, 1, null);
if (!itemStack.isEmpty()) {
NON_BLOCKING_MAP.get(modid).putIfAbsent(itemStack.getItem(), new IntOpenHashSet());
NON_BLOCKING_MAP.get(modid).computeIfPresent(itemStack.getItem(), (item, intSet) ->
{
intSet.add(itemStack.getItemDamage());
return intSet;
});
}
} }
} }
if (!found) {
AELog.error("Item not found on nonBlocking config: " + s);
}
} else if (ModItemMeta[0].equals("ore")) {
OreDictionary.getOres(ModItemMeta[1]).forEach(itemStack ->
{
NON_BLOCKING_MAP.get(modid).putIfAbsent(itemStack.getItem(), new IntOpenHashSet());
NON_BLOCKING_MAP.get(modid).computeIfPresent(itemStack.getItem(), (item, intSet) ->
{
intSet.add(itemStack.getItemDamage());
return intSet;
});
});
} else {
ItemStack itemStack = GameRegistry.makeItemStack(ModItemMeta[0] + ":" + ModItemMeta[1], ModItemMeta.length == 3 ? Integer.parseInt(ModItemMeta[2]) : 0, 1, null);
if (!itemStack.isEmpty()) {
NON_BLOCKING_MAP.get(modid).putIfAbsent(itemStack.getItem(), new IntOpenHashSet());
NON_BLOCKING_MAP.get(modid).computeIfPresent(itemStack.getItem(), (item, intSet) ->
{
intSet.add(itemStack.getItemDamage());
return intSet;
});
} else {
AELog.error("Item not found on nonBlocking config: " + s);
}
} }
} }
} }
src/main/java/appeng/integration/IntegrationNode.java
+2 -2
View File
@@ -22,7 +22,7 @@ package appeng.integration;
import appeng.api.exceptions.ModNotInstalledException; import appeng.api.exceptions.ModNotInstalledException;
import appeng.core.AEConfig; import appeng.core.AEConfig;
import appeng.core.AELog; import appeng.core.AELog;
import net.minecraftforge.fml.common.Loader; import appeng.util.Platform;
import net.minecraftforge.fml.common.ModAPIManager; import net.minecraftforge.fml.common.ModAPIManager;
@@ -64,7 +64,7 @@ final class IntegrationNode {
switch (stage) { switch (stage) {
case PRE_INIT: case PRE_INIT:
final ModAPIManager apiManager = ModAPIManager.INSTANCE; final ModAPIManager apiManager = ModAPIManager.INSTANCE;
boolean enabled = this.modID == null || Loader.isModLoaded(this.modID) || apiManager.hasAPI(this.modID); boolean enabled = this.modID == null || Platform.isModLoaded(this.modID) || apiManager.hasAPI(this.modID);
AEConfig.instance() AEConfig.instance()
.addCustomCategoryComment("ModIntegration", .addCustomCategoryComment("ModIntegration",
src/main/java/appeng/integration/modules/bogosorter/InventoryBogoSortModule.java
+2 -2
View File
@@ -1,13 +1,13 @@
package appeng.integration.modules.bogosorter; package appeng.integration.modules.bogosorter;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.util.Platform;
import com.cleanroommc.bogosorter.common.sort.SortHandler; import com.cleanroommc.bogosorter.common.sort.SortHandler;
import net.minecraftforge.fml.common.Loader;
import java.util.Comparator; import java.util.Comparator;
public class InventoryBogoSortModule { public class InventoryBogoSortModule {
private static final boolean loaded = Loader.isModLoaded("bogosorter"); private static final boolean loaded = Platform.isModLoaded("bogosorter");
public static final Comparator<IAEItemStack> COMPARATOR = (o1, o2) -> SortHandler.getClientItemComparator().compare(o1.getDefinition(), o2.getDefinition()); public static final Comparator<IAEItemStack> COMPARATOR = (o1, o2) -> SortHandler.getClientItemComparator().compare(o1.getDefinition(), o2.getDefinition());
src/main/java/appeng/services/VersionChecker.java
+3 -3
View File
@@ -25,9 +25,9 @@ import appeng.core.AppEng;
import appeng.services.version.*; import appeng.services.version.*;
import appeng.services.version.github.FormattedRelease; import appeng.services.version.github.FormattedRelease;
import appeng.services.version.github.ReleaseFetcher; import appeng.services.version.github.ReleaseFetcher;
import appeng.util.Platform;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraftforge.fml.common.event.FMLInterModComms;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@@ -82,7 +82,7 @@ public final class VersionChecker implements Runnable {
final long lastCheck = Long.parseLong(rawLastCheck); final long lastCheck = Long.parseLong(rawLastCheck);
final Date now = new Date(); final Date now = new Date();
final long nowInMs = now.getTime(); final long nowInMs = now.getTime();
final long intervalInMs = this.config.interval() * SEC_TO_HOUR * MS_TO_SEC; final long intervalInMs = (long) this.config.interval() * SEC_TO_HOUR * MS_TO_SEC;
final long lastAfterInterval = lastCheck + intervalInMs; final long lastAfterInterval = lastCheck + intervalInMs;
this.processInterval(nowInMs, lastAfterInterval); this.processInterval(nowInMs, lastAfterInterval);
@@ -153,7 +153,7 @@ public final class VersionChecker implements Runnable {
* @param changelog retrieved github changelog * @param changelog retrieved github changelog
*/ */
private void interactWithVersionCheckerMod(@Nonnull final String modFormatted, @Nonnull final String ghFormatted, @Nonnull final String changelog) { private void interactWithVersionCheckerMod(@Nonnull final String modFormatted, @Nonnull final String ghFormatted, @Nonnull final String changelog) {
if (Loader.isModLoaded("VersionChecker")) { if (Platform.isModLoaded("VersionChecker")) {
final NBTTagCompound versionInf = new NBTTagCompound(); final NBTTagCompound versionInf = new NBTTagCompound();
versionInf.setString("modDisplayName", AppEng.MOD_NAME); versionInf.setString("modDisplayName", AppEng.MOD_NAME);
versionInf.setString("oldVersion", modFormatted); versionInf.setString("oldVersion", modFormatted);
src/main/java/appeng/util/Platform.java
+13 -16
View File
@@ -73,6 +73,8 @@ import gregtech.api.block.machines.BlockMachine;
import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.util.GTUtility; import gregtech.api.util.GTUtility;
import ic2.api.item.ICustomDamageItem; import ic2.api.item.ICustomDamageItem;
import it.unimi.dsi.fastutil.objects.Object2BooleanMap;
import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@@ -106,7 +108,6 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModContainer;
import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.ReflectionHelper;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
@@ -130,6 +131,7 @@ import java.util.*;
*/ */
@Optional.Interface(iface = "ic2.api.item.ICustomDamageItem", modid = "IC2") @Optional.Interface(iface = "ic2.api.item.ICustomDamageItem", modid = "IC2")
public class Platform { public class Platform {
private static final Object2BooleanMap<String> CACHED_MODS = new Object2BooleanOpenHashMap<>();
public static final Block AIR_BLOCK = Blocks.AIR; public static final Block AIR_BLOCK = Blocks.AIR;
@@ -526,18 +528,15 @@ public class Platform {
} }
public static boolean isModLoaded(final String modid) { public static boolean isModLoaded(final String modid) {
try { return CACHED_MODS.computeIfAbsent(modid, (k) -> {
// if this fails for some reason, try the other method. try {
return Loader.isModLoaded(modid); // if this fails for some reason, try the other method.
} catch (final Throwable ignored) { return Loader.isModLoaded(k);
} } catch (final Throwable ignored) {}
for (final ModContainer f : Loader.instance().getActiveModList()) { return Loader.instance().getActiveModList()
if (f.getModId().equals(modid)) { .stream().anyMatch(mod -> mod.getModId().equals(k));
return true; });
}
}
return false;
} }
public static ItemStack findMatchingRecipeOutput(final InventoryCrafting ic, final World world) { public static ItemStack findMatchingRecipeOutput(final InventoryCrafting ic, final World world) {
@@ -551,8 +550,7 @@ public class Platform {
} }
ItemStack itemStack = ItemStack.EMPTY; ItemStack itemStack = ItemStack.EMPTY;
if (o instanceof AEItemStack) { if (o instanceof AEItemStack ais) {
final AEItemStack ais = (AEItemStack) o;
return ais.getToolTip(); return ais.getToolTip();
} else if (o instanceof ItemStack) { } else if (o instanceof ItemStack) {
itemStack = (ItemStack) o; itemStack = (ItemStack) o;
@@ -655,8 +653,7 @@ public class Platform {
} }
if (eq.getItem() instanceof IAEWrench) { if (eq.getItem() instanceof IAEWrench wrench) {
final IAEWrench wrench = (IAEWrench) eq.getItem();
return wrench.canWrench(eq, player, pos); return wrench.canWrench(eq, player, pos);
} }
} }