Merge branch 'master' into exnihilo

Author: Irgendwer01

dependencies.gradle

@@ -41,6 +41,17 @@ dependencies {
     compileOnlyApi "curse.maven:exnihilo-274456:2817545" // Ex Nihilo Creatio 0.4.7.2
     compileOnlyApi rfg.deobf("curse.maven:hwyla-253449:2568751") // HWYLA 1.8.26-B41
     compileOnlyApi rfg.deobf("curse.maven:baubles-227083:2518667") // Baubles 1.5.2
+    compileOnlyApi rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387
+
+    // Mods with Soft compat but which have no need to be in code, such as isModLoaded() checks and getModItem() recipes.
+    // Uncomment any of these to test them in-game.
+
+    // runtimeOnly rfg.deobf("curse.maven:beebetteratbees-244516:2627215") // BeeBetterAtBees 2.0.3 (recommended to enable when testing Forestry compat)
+    // runtimeOnly rfg.deobf("curse.maven:jei-bees-248370:2490058") // JEIBees 0.9.0.5 (recommended to enable when testing Forestry compat)
+    // runtimeOnly rfg.deobf("curse.maven:binnies-mods-223525:2916129") // Binnie 2.5.1.203
+    // runtimeOnly rfg.deobf("curse.maven:magic-bees-65764:2855061") // Magic Bees 3.2.25
+    // runtimeOnly rfg.deobf("curse.maven:gendustry-70492:2516215") // Gendustry 1.6.5.8
+    // runtimeOnly rfg.deobf("curse.maven:bdlib-70496:2518031") // BdLib 1.14.3.12
 }
 
 minecraft {

gradle.properties

@@ -7,7 +7,7 @@ modGroup = gregtech
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.7.3-beta
+modVersion = 2.7.4-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true

src/main/java/gregtech/GregTechMod.java

@@ -24,6 +24,10 @@
                 + "required-after:codechickenlib@[3.2.3,);"
                 + "after:appliedenergistics2;"
                 + "after:forestry;"
+                + "after:extrabees;"
+                + "after:extratrees;"
+                + "after:genetics;"
+                + "after:magicbees;"
                 + "after:jei@[4.15.0,);"
                 + "after:crafttweaker@[4.1.20,);"
                 + "after:groovyscript@[0.6.0,);"

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

@@ -147,7 +147,18 @@ public class GTValues {
             MODID_EN = "exnihilocreatio",
             MODID_HWYLA = "hwyla",
             MODID_BAUBLES = "baubles",
-            MODID_TOP_ADDONS = "topaddons";
+            MODID_TOP_ADDONS = "topaddons",
+            MODID_IC2 = "ic2",
+            MODID_GTFO = "gregtechfoodoption",
+            MODID_BINNIE = "binniecore",
+            MODID_XU2 = "extrautils2",
+            MODID_TR = "techreborn",
+            MODID_MB = "magicbees",
+            MODID_EB = "extrabees",
+            MODID_ET = "extratrees",
+            MODID_GENETICS = "genetics",
+            MODID_BOP = "biomesoplenty",
+            MODID_TCON = "tconstruct";
 
     private static Boolean isClient;
 

src/main/java/gregtech/api/metatileentity/SimpleGeneratorMetaTileEntity.java

@@ -116,10 +116,14 @@ protected ModularUI.Builder createGuiTemplate(EntityPlayer player) {
     @Override
     public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline) {
         super.renderMetaTileEntity(renderState, translation, pipeline);
-        this.renderer.renderOrientedState(renderState, translation, pipeline, getFrontFacing(), workable.isActive(), workable.isWorkingEnabled());
+        renderOverlays(renderState, translation, pipeline);
         Textures.ENERGY_OUT.renderSided(getFrontFacing(), renderState, translation, PipelineUtil.color(pipeline, GTValues.VC[getTier()]));
     }
 
+    protected void renderOverlays(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline) {
+        this.renderer.renderOrientedState(renderState, translation, pipeline, getFrontFacing(), workable.isActive(), workable.isWorkingEnabled());
+    }
+
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         return createGuiTemplate(entityPlayer).build(getHolder(), entityPlayer);

src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java

@@ -8,7 +8,10 @@
 import gregtech.api.gui.Widget;
 import gregtech.api.gui.Widget.ClickData;
 import gregtech.api.gui.resources.TextureArea;
-import gregtech.api.gui.widgets.*;
+import gregtech.api.gui.widgets.AdvancedTextWidget;
+import gregtech.api.gui.widgets.ImageCycleButtonWidget;
+import gregtech.api.gui.widgets.ImageWidget;
+import gregtech.api.gui.widgets.IndicatorImageWidget;
 import gregtech.api.pattern.PatternMatchContext;
 import gregtech.api.pattern.TraceabilityPredicate;
 import gregtech.api.unification.OreDictUnifier;
@@ -328,15 +331,22 @@ public TraceabilityPredicate autoAbilities() {
     public TraceabilityPredicate autoAbilities(boolean checkMaintenance, boolean checkMuffler) {
         TraceabilityPredicate predicate = new TraceabilityPredicate();
         if (checkMaintenance && hasMaintenanceMechanics()) {
-            predicate = predicate.or(abilities(MultiblockAbility.MAINTENANCE_HATCH)
-                    .setMinGlobalLimited(ConfigHolder.machines.enableMaintenance ? 1 : 0).setMaxGlobalLimited(1));
+            predicate = predicate.or(maintenancePredicate());
         }
         if (checkMuffler && hasMufflerMechanics()) {
             predicate = predicate.or(abilities(MultiblockAbility.MUFFLER_HATCH).setMinGlobalLimited(1).setMaxGlobalLimited(1));
         }
         return predicate;
     }
 
+    protected TraceabilityPredicate maintenancePredicate() {
+        if (hasMaintenanceMechanics()) {
+            return abilities(MultiblockAbility.MAINTENANCE_HATCH)
+                    .setMinGlobalLimited(ConfigHolder.machines.enableMaintenance ? 1 : 0).setMaxGlobalLimited(1);
+        }
+        return new TraceabilityPredicate();
+    }
+
     /**
      * Called serverside to obtain text displayed in GUI
      * each element of list is displayed on new line

src/main/java/gregtech/api/modules/GregTechModule.java

@@ -5,23 +5,47 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+/**
+ * All of your {@link IGregTechModule} classes must be annotated with this to be registered.
+ */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface GregTechModule {
 
+    /**
+     * The ID of this module. Must be unique within its container.
+     */
     String moduleID();
 
+    /**
+     * The ID of the container to associate this module with.
+     */
     String containerID();
 
+    /**
+     * A human-readable name for this module.
+     */
     String name();
 
+    /**
+     * A list of mod IDs that this module depends on. If any mods specified are not present, the module will not load.
+     */
     String[] modDependencies() default {};
 
+    /**
+     * Whether this module is the "core" module for its container.
+     * Each container must have exactly one core module, which will be loaded before all other modules in the container.
+     * <p>
+     * Core modules should not have mod dependencies.
+     */
     boolean coreModule() default false;
 
     String author() default "";
 
     String version() default "";
 
-    String descriptionKey() default "";
+    /**
+     * A description of this module in the module configuration file.
+     */
+    String description() default "";
 }

src/main/java/gregtech/api/modules/IGregTechModule.java

@@ -9,8 +9,18 @@
 import java.util.List;
 import java.util.Set;
 
+/**
+ * All modules must implement this interface.
+ * <p>
+ * Provides methods for responding to FML lifecycle events, adding event bus subscriber classes, and processing IMC messages.
+ */
 public interface IGregTechModule {
 
+    /**
+     * What other modules this module depends on.
+     * <p>
+     * e.g. <code>new ResourceLocation("gregtech", "foo_module")</code> represents a dependency on the module "foo_module" in the container "gregtech"
+     */
     @Nonnull
     default Set<ResourceLocation> getDependencyUids() {
         return Collections.emptySet();
@@ -46,9 +56,16 @@ default void serverStopping(FMLServerStoppingEvent event) {
     default void serverStopped(FMLServerStoppedEvent event) {
     }
 
+    /**
+     * Register packets using GregTech's packet handling API here.
+     */
     default void registerPackets() {
     }
 
+    /**
+     * @return A list of classes to subscribe to the Forge event bus.
+     * As the class gets subscribed, not any specific instance, event handlers must be static!
+     */
     @Nonnull
     default List<Class<?>> getEventBusSubscribers() {
         return Collections.emptyList();
@@ -58,6 +75,9 @@ default boolean processIMC(FMLInterModComms.IMCMessage message) {
         return false;
     }
 
+    /**
+     * @return A logger to use for this module.
+     */
     @Nonnull
     Logger getLogger();
 }

src/main/java/gregtech/api/modules/IModuleContainer.java

@@ -2,5 +2,8 @@
 
 public interface IModuleContainer {
 
+    /**
+     * The ID of this container. If this is your mod's only container, you should use your mod ID to prevent collisions.
+     */
     String getID();
 }

src/main/java/gregtech/api/modules/ModuleContainer.java

@@ -0,0 +1,14 @@
+package gregtech.api.modules;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotate your {@link IModuleContainer} with this for it to be automatically registered.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ModuleContainer {
+}