Removed AEApi

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
+1 -1
View File
@@ -25,7 +25,7 @@ public class AETrading {
/*
* @Override public void manipulateTradesForVillager( EntityVillager villager,
* MerchantRecipeList recipeList, Random random ) { final IMaterials materials =
* AEApi.instance().definitions().materials(); this.addMerchant( recipeList,
* Api.instance().definitions().materials(); this.addMerchant( recipeList,
* materials.silicon(), 1, random, 2 ); this.addMerchant( recipeList,
* materials.certusQuartzCrystal(), 2, random, 4 ); this.addMerchant(
* recipeList, materials.certusQuartzDust(), 1, random, 3 ); this.addTrade(
@@ -18,14 +18,8 @@
package appeng.hooks;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUseContext;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public interface IBlockTool {
// Workaround for dispenser logic.
+2 -2
View File
@@ -42,12 +42,12 @@ import net.minecraftforge.event.TickEvent.Type;
import net.minecraftforge.event.TickEvent.WorldTickEvent;
import net.minecraftforge.event.world.WorldEvent;
import appeng.api.AEApi;
import appeng.api.networking.IGridNode;
import appeng.api.parts.CableRenderMode;
import appeng.api.util.AEColor;
import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.Api;
import appeng.core.AppEng;
import appeng.core.sync.packets.PaintedEntityPacket;
import appeng.crafting.CraftingJob;
@@ -150,7 +150,7 @@ public class TickHandler {
if (ev.type == Type.CLIENT && ev.phase == Phase.START) {
this.tickColors(this.cliPlayerColors);
final CableRenderMode currentMode = AEApi.instance().partHelper().getCableRenderMode();
final CableRenderMode currentMode = Api.instance().partHelper().getCableRenderMode();
if (currentMode != this.crm) {
this.crm = currentMode;
AppEng.proxy.triggerUpdates();