2.8 Feature Branch

src/main/java/gregtech/api/GTValues.java

@@ -1,6 +1,5 @@
 package gregtech.api;
 
-import gregtech.GregTechVersion;
 import gregtech.api.util.XSTR;
 import gregtech.common.ConfigHolder;
 import net.minecraftforge.fml.common.FMLCommonHandler;
@@ -18,16 +17,6 @@
  */
 public class GTValues {
 
-    /**
-     * Version String for use in addon mods' @Mod(dependencies = "...") block.
-     *
-     * @deprecated use {@link gregtech.GTInternalTags#VERSION}
-     *
-     * </p> This field was deprecated in 2.6 and will be removed in 2.8
-     */
-    @Deprecated
-    public static final String MOD_VERSION_DEP = "required-after:gregtech@[" + GregTechVersion.DEP_VERSION + ",);";
-
     /**
      * <p/>
      * This is worth exactly one normal Item.

src/main/java/gregtech/api/GregTechAPI.java

@@ -16,6 +16,7 @@
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.registry.IMaterialRegistryManager;
+import gregtech.api.unification.material.registry.MarkerMaterialRegistry;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.ore.StoneType;
 import gregtech.api.util.BaseCreativeTab;
@@ -55,6 +56,8 @@ public class GregTechAPI {
     public static ISoundManager soundManager;
     /** Will be available at the Construction stage */
     public static IMaterialRegistryManager materialManager;
+    /** Will be available at the Pre-Initialization stage */
+    public static MarkerMaterialRegistry markerMaterialRegistry;
 
     /** Will be available at the Pre-Initialization stage */
     private static boolean highTier;

src/main/java/gregtech/api/block/machines/BlockMachine.java

@@ -9,7 +9,7 @@
 import gregtech.api.block.BlockCustomParticle;
 import gregtech.api.block.UnlistedIntegerProperty;
 import gregtech.api.block.UnlistedStringProperty;
-import gregtech.api.cover.CoverBehavior;
+import gregtech.api.cover.Cover;
 import gregtech.api.cover.IFacadeCover;
 import gregtech.api.items.toolitem.ToolClasses;
 import gregtech.api.items.toolitem.ToolHelper;
@@ -445,9 +445,9 @@ public IBlockState getFacade(@Nonnull IBlockAccess world, @Nonnull BlockPos pos,
     public IBlockState getFacade(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) {
         MetaTileEntity metaTileEntity = getMetaTileEntity(world, pos);
         if (metaTileEntity != null && side != null) {
-            CoverBehavior coverBehavior = metaTileEntity.getCoverAtSide(side);
-            if (coverBehavior instanceof IFacadeCover) {
-                return ((IFacadeCover) coverBehavior).getVisualState();
+            Cover cover = metaTileEntity.getCoverAtSide(side);
+            if (cover instanceof IFacadeCover facadeCover) {
+                return facadeCover.getVisualState();
             }
         }
         return world.getBlockState(pos);