remove old api

GregTechCEu · Sep 4, 2023 · eab670b · eab670b
1 parent de606b9
commit eab670b
Show file tree

Hide file tree

Showing 83 changed files with 241 additions and 985 deletions.
diff --git a/src/main/java/gregtech/api/GregTechAPI.java b/src/main/java/gregtech/api/GregTechAPI.java
@@ -5,7 +5,6 @@
 import gregtech.api.block.machines.BlockMachine;
 import gregtech.api.command.ICommandManager;
 import gregtech.api.cover.CoverDefinition;
-import gregtech.api.cover2.CoverDefinition2;
 import gregtech.api.event.HighTierEvent;
 import gregtech.api.gui.UIFactory;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -64,7 +63,6 @@ public class GregTechAPI {
     public static final GTControlledRegistry<ResourceLocation, MetaTileEntity> MTE_REGISTRY = new GTControlledRegistry<>(Short.MAX_VALUE);
     public static final GTControlledRegistry<ResourceLocation, UIFactory> UI_FACTORY_REGISTRY = new GTControlledRegistry<>(Short.MAX_VALUE);
     public static final GTControlledRegistry<ResourceLocation, CoverDefinition> COVER_REGISTRY = new GTControlledRegistry<>(Integer.MAX_VALUE);
-    public static final GTControlledRegistry<ResourceLocation, CoverDefinition2> COVER_REGISTRY_2 = new GTControlledRegistry<>(Integer.MAX_VALUE);
 
     public static BlockMachine MACHINE;
     public static final Map<Material, Map<StoneType, IBlockOre>> oreBlockTable = new HashMap<>();

diff --git a/src/main/java/gregtech/api/block/machines/BlockMachine.java b/src/main/java/gregtech/api/block/machines/BlockMachine.java
@@ -9,8 +9,8 @@
 import gregtech.api.block.BlockCustomParticle;
 import gregtech.api.block.UnlistedIntegerProperty;
 import gregtech.api.block.UnlistedStringProperty;
+import gregtech.api.cover.Cover;
 import gregtech.api.cover.IFacadeCover;
-import gregtech.api.cover2.Cover;
 import gregtech.api.items.toolitem.ToolClasses;
 import gregtech.api.items.toolitem.ToolHelper;
 import gregtech.api.metatileentity.MetaTileEntity;

diff --git a/src/main/java/gregtech/api/capability/GregtechTileCapabilities.java b/src/main/java/gregtech/api/capability/GregtechTileCapabilities.java
@@ -1,8 +1,7 @@
 package gregtech.api.capability;
 
 import gregtech.api.capability.impl.AbstractRecipeLogic;
-import gregtech.api.cover.ICoverable;
-import gregtech.api.cover2.CoverHolder;
+import gregtech.api.cover.CoverHolder;
 import gregtech.api.metatileentity.multiblock.IMaintenance;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityInject;
@@ -12,9 +11,6 @@ public class GregtechTileCapabilities {
     @CapabilityInject(IWorkable.class)
     public static Capability<IWorkable> CAPABILITY_WORKABLE = null;
 
-    @CapabilityInject(ICoverable.class)
-    public static Capability<ICoverable> CAPABILITY_COVERABLE = null;
-
     @CapabilityInject(CoverHolder.class)
     public static Capability<CoverHolder> CAPABILITY_COVER_HOLDER = null;
 

diff --git a/src/main/java/gregtech/api/capability/SimpleCapabilityManager.java b/src/main/java/gregtech/api/capability/SimpleCapabilityManager.java
@@ -1,8 +1,7 @@
 package gregtech.api.capability;
 
 import gregtech.api.capability.impl.AbstractRecipeLogic;
-import gregtech.api.cover.ICoverable;
-import gregtech.api.cover2.CoverHolder;
+import gregtech.api.cover.CoverHolder;
 import gregtech.api.metatileentity.multiblock.IMaintenance;
 import gregtech.api.terminal.hardware.HardwareProvider;
 import gregtech.api.worldgen.generator.GTWorldGenCapability;
@@ -38,7 +37,6 @@ public static void init() {
         registerCapabilityWithNoDefault(IEnergyContainer.class);
         registerCapabilityWithNoDefault(IElectricItem.class);
         registerCapabilityWithNoDefault(IWorkable.class);
-        registerCapabilityWithNoDefault(ICoverable.class);
         registerCapabilityWithNoDefault(CoverHolder.class);
         registerCapabilityWithNoDefault(IControllable.class);
         registerCapabilityWithNoDefault(IActiveOutputSide.class);

diff --git a/src/main/java/gregtech/api/cover2/Cover.java → src/main/java/gregtech/api/cover/Cover.java b/src/main/java/gregtech/api/cover2/Cover.java → src/main/java/gregtech/api/cover/Cover.java
@@ -1,4 +1,4 @@
-package gregtech.api.cover2;
+package gregtech.api.cover;
 
 import codechicken.lib.raytracer.CuboidRayTraceResult;
 import codechicken.lib.render.CCRenderState;
@@ -32,7 +32,7 @@ public interface Cover {
      */
     @NotNull CoverableView getCoverable();
 
-    @NotNull CoverDefinition2 getDefinition();
+    @NotNull CoverDefinition getDefinition();
 
     /**
      * @return the World containing this cover

diff --git a/...n/java/gregtech/api/cover2/CoverBase.java → ...in/java/gregtech/api/cover/CoverBase.java b/...n/java/gregtech/api/cover2/CoverBase.java → ...in/java/gregtech/api/cover/CoverBase.java
@@ -1,4 +1,4 @@
-package gregtech.api.cover2;
+package gregtech.api.cover;
 
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.pipeline.IVertexOperation;
@@ -16,19 +16,19 @@
 
 public abstract class CoverBase implements Cover {
 
-    private final CoverDefinition2 definition;
+    private final CoverDefinition definition;
     private final CoverableView coverableView;
     private final EnumFacing attachedSide;
 
-    public CoverBase(@NotNull CoverDefinition2 definition, @NotNull CoverableView coverableView,
+    public CoverBase(@NotNull CoverDefinition definition, @NotNull CoverableView coverableView,
                      @NotNull EnumFacing attachedSide) {
         this.definition = definition;
         this.coverableView = coverableView;
         this.attachedSide = attachedSide;
     }
 
     @Override
-    public final @NotNull CoverDefinition2 getDefinition() {
+    public final @NotNull CoverDefinition getDefinition() {
         return this.definition;
     }
 

diff --git a/src/main/java/gregtech/api/cover/CoverBehavior.java b/src/main/java/gregtech/api/cover/CoverBehavior.java