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

Removed AEApi

Browse Source 
Moved all internal access to the internal `Api` class using a new static
getter.
This commit is contained in:
yueh
2020-07-11 19:40:34 +02:00
parent d18eabe1fc
commit 0d43ca15be
168 changed files with 757 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/Platform.java
+6 -8
View File
@@ -34,7 +34,6 @@ import com.google.common.collect.Iterables;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.client.Minecraft;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.Entity;
@@ -70,7 +69,6 @@ import net.minecraftforge.fml.common.thread.SidedThreadGroups;
import net.minecraftforge.fml.loading.FMLEnvironment;
import net.minecraftforge.registries.ForgeRegistries;
import appeng.api.AEApi;
import appeng.api.config.AccessRestriction;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
@@ -103,6 +101,7 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.Api;
import appeng.core.stats.AeStats;
import appeng.fluids.util.AEFluidStack;
import appeng.hooks.TickHandler;
@@ -873,11 +872,11 @@ public class Platform {
@SuppressWarnings({ "rawtypes", "unchecked" })
public static void postChanges(final IStorageGrid gs, final ItemStack removed, final ItemStack added,
final IActionSource src) {
for (final IStorageChannel<?> chan : AEApi.instance().storage().storageChannels()) {
for (final IStorageChannel<?> chan : Api.instance().storage().storageChannels()) {
final IItemList<?> myChanges = chan.createList();
if (!removed.isEmpty()) {
final IMEInventory myInv = AEApi.instance().registries().cell().getCellInventory(removed, null, chan);
final IMEInventory myInv = Api.instance().registries().cell().getCellInventory(removed, null, chan);
if (myInv != null) {
myInv.getAvailableItems(myChanges);
for (final IAEStack is : myChanges) {
@@ -886,7 +885,7 @@ public class Platform {
}
}
if (!added.isEmpty()) {
final IMEInventory myInv = AEApi.instance().registries().cell().getCellInventory(added, null, chan);
final IMEInventory myInv = Api.instance().registries().cell().getCellInventory(added, null, chan);
if (myInv != null) {
myInv.getAvailableItems(myChanges);
}
@@ -1136,8 +1135,7 @@ public class Platform {
}
if (type == AEFeature.CERTUS_QUARTZ_TOOLS) {
final IItemDefinition certusQuartzCrystal = AEApi.instance().definitions().materials()
.certusQuartzCrystal();
final IItemDefinition certusQuartzCrystal = Api.instance().definitions().materials().certusQuartzCrystal();
return certusQuartzCrystal.isSameAs(b);
}
@@ -1156,7 +1154,7 @@ public class Platform {
}
public static boolean isRecipePrioritized(final ItemStack what) {
final IMaterials materials = AEApi.instance().definitions().materials();
final IMaterials materials = Api.instance().definitions().materials();
boolean isPurified = materials.purifiedCertusQuartzCrystal().isSameAs(what);
isPurified |= materials.purifiedFluixCrystal().isSameAs(what);