Updated Changelog and version bump to 1.16.0 (#1676)

GregTechCE · Jun 29, 2021 · 52b948d · 52b948d
1 parent fdab28c
commit 52b948d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 ## Changelog
 
+### 1.16.0
+* Added Fluid Regulator (#1570) - hjae78
+* Added Info tab for multiblock description (#1583) - ALongStringOfNumbers
+* Update input/output overlays on buses/hatches to look different (#1607) - galyfray
+* Updated name of Phosphate to Tricalcium Phosphate (#1659) - MounderFod
+* Updated systems to new Recipe Properties (#1672) - ALongStringOfNumbers
+* Fixed wire and cable lang (#1645) - TechLord22
+* Fixed typo in Monazite vein preventing surface rock spawning (#1649) - ALongStringOfNumbers
+* Fixed Electric Pump Assembler recipe using wrong cable (#1650) - ALongStringOfNumbers
+* Fixed damage is not applied when a saw is used as shears (#1655) - Adrian Brock
+* Fixed name overlaps in GUIs (#1665) - TechLord22
+* Fixed Surface Block generation issue, add logging (#1666) - ALongStringOfNumbers
+* Fixed Ore generation Page glitches (#1668) - ALongStringOfNumbers
+* Internal migrated Json Recipes to Java Code (#1634) - Dane Strandboge
+* Internal added isHidden to RecipeMaps to hide the default RecipeMapCategory (#1652) - bruberu
+
 ### 1.15.1
 * Added recipe using liquid ice (#1620) - ALongStringOfNumbers
 * Added Active Overlay to single block Steam and Gas Turbines (#1624) - dan

diff --git a/src/main/java/gregtech/GregTechVersion.java b/src/main/java/gregtech/GregTechVersion.java
@@ -6,9 +6,9 @@ public final class GregTechVersion {
 
     public static final int MAJOR = 1;
     //This number is incremented every major feature update
-    public static final int MINOR = 15;
+    public static final int MINOR = 16;
     //This number is incremented every time the feature is added, or bug is fixed. resets every major version change
-    public static final int REVISION = 1;
+    public static final int REVISION = 0;
     //This number is incremented every build, and never reset. Should always be 0 in the repo code.
     public static final int BUILD = 0;
 

diff --git a/src/main/java/gregtech/common/covers/CoverBehaviors.java b/src/main/java/gregtech/common/covers/CoverBehaviors.java
@@ -21,6 +21,8 @@
 
 public class CoverBehaviors {
 
+    private static final int COVERS_PER_ITEM = 8;
+
     public static void init() {
         GTLog.logger.info("Registering cover behaviors...");
         registerBehavior(0, new ResourceLocation(GTValues.MODID, "conveyor.lv"), MetaItems.CONVEYOR_MODULE_LV, (tile, side) -> new CoverConveyor(tile, side, GTValues.LV, 8));
@@ -54,12 +56,14 @@ public static void init() {
         registerBehavior(38, new ResourceLocation(GTValues.MODID, "smart_filter"), MetaItems.SMART_FILTER, (tile, side) -> new CoverItemFilter(tile, side, "cover.smart_item_filter.title", Textures.SMART_FILTER_FILTER_OVERLAY, new SmartItemFilter()));
         registerBehavior(39, new ResourceLocation(GTValues.MODID, "facade"), MetaItems.COVER_FACADE, CoverFacade::new);
 
-        for (int i = 1; i < GTValues.V.length - 1; i++) {
-            int finalI = i;
-            registerBehavior(40 + i - 1, new ResourceLocation(GTValues.MODID, "fluid.regulator" + GTValues.VN[i].toLowerCase(Locale.ROOT)), MetaItems.PUMPS[i - 1], (tile, side) -> new CoverPump(tile, side, finalI, (int) (Math.pow(4, finalI - 1) * 1280)));
-            registerBehavior(20 + i - 1, new ResourceLocation(GTValues.MODID, "pump" + GTValues.VN[i].toLowerCase(Locale.ROOT)), MetaItems.FLUID_REGULATORS[i - 1], (tile, side) -> new CoverFluidRegulator(tile, side, finalI, (int) (Math.pow(4, finalI - 1) * 1280)));
-        }
+        for (int i = 0; i < COVERS_PER_ITEM; i++) {
+            int throughput = (int) (Math.pow(4, i) * 1280);
+            final int coverTier = i + 1;
+            String tierShortName = GTValues.VN[coverTier].toLowerCase(Locale.ROOT);
 
+            registerBehavior(20 + i, new ResourceLocation(GTValues.MODID, "pump." + tierShortName), MetaItems.PUMPS[i], (tile, side) -> new CoverPump(tile, side, coverTier, throughput));
+            registerBehavior(40 + i, new ResourceLocation(GTValues.MODID, "fluid.regulator." + tierShortName), MetaItems.FLUID_REGULATORS[i], (tile, side) -> new CoverFluidRegulator(tile, side, coverTier, throughput));
+        }
     }
 
     public static void registerBehavior(int coverNetworkId, ResourceLocation coverId, MetaValueItem placerItem, BiFunction<ICoverable, EnumFacing, CoverBehavior> behaviorCreator) {