Update seasons addon for S7, improved color caching and GUI adjustments, v0.2.4

Author: Arminias

gradle.properties

@@ -5,7 +5,7 @@ minecraft_version = 1.6.4
 yarn_mappings = 1.6.4+build.420
 loader_version = 0.14.19
 
-mod_version = 0.2.3
+mod_version = 0.2.4
 maven_group = btw.community
 archives_base_name = seasons-addon
 

src/main/java/btw/arminias/seasons/BiomeCustomSeason.java

@@ -3,6 +3,7 @@
 public interface BiomeCustomSeason extends ClimateInfluenced {
     void seasonsAddon$setSeasonColorLookupGrass(int[] arr);
     void seasonsAddon$setSeasonColorLookupFoliage(int[] arr);
+    void seasonsAddon$updateColorCache(boolean override);
 
     default int seasonsAddon$getSeasonSpecificColor(int season, int color) {
         int alpha = (color >> 24) & 0xFF;

src/main/java/btw/arminias/seasons/mixin/BiomeGenBaseMixin.java

@@ -58,20 +58,12 @@ private void callCustomInit(int par1, CallbackInfo ci) {
             int seasons = seasonsAddon$getSeasons();
             seasonsAddon$setSeasonColorLookupGrass(new int[seasons]);
             seasonsAddon$setSeasonColorLookupFoliage(new int[seasons]);
-            // Only in this super class
-            updateColorCache(false);
         }
     }
 
-    @Environment(EnvType.CLIENT)
-    @Inject(method= "setTemperatureRainfall", at = @At("RETURN"))
-    private void callGenerateColorCache(CallbackInfoReturnable<BiomeGenBase> cir) {
-        updateColorCache(true);
-    }
-
     @Unique
     @Environment(EnvType.CLIENT)
-    private void updateColorCache(boolean override) {
+    public void seasonsAddon$updateColorCache(boolean override) {
         int seasons = seasonsAddon$getSeasons();
         for (int season = 0; season < seasons; season++) {
             float r = MathHelper.clamp_float(rainfall * seasonsAddon$getRainfallSpline().getUnit((float) season / seasons), 0F, 1F);
@@ -142,8 +134,8 @@ private void adaptFoliage(CallbackInfoReturnable<Integer> cir) {
     @Environment(EnvType.CLIENT)
     public int seasonsAddon$getMonthSpecificColorCached(int month, boolean grass, boolean override) {
         int[] arr = grass ? monthColorLookupGrass : monthColorLookupFoliage;
-        int i = arr[month];
-        if (i == 0 || override) {
+        int color = arr[month];
+        if (color == 0 || override) {
             int seasons = seasonsAddon$getSeasons();
             int months = SeasonsAddonMod.MONTHS;
             assert months > seasons;
@@ -175,9 +167,9 @@ private void adaptFoliage(CallbackInfoReturnable<Integer> cir) {
             int green = (int) sp_g.getUnit((float)month/months);
             int blue = (int) sp_b.getUnit((float)month/months);
             arr[month] = (0xFF << 24) | (red << 16) | (green << 8) | blue;
-            i = arr[month];
+            color = arr[month];
         }
-        return i;
+        return color;
     }
 
     @Unique

src/main/java/btw/arminias/seasons/mixin/ExampleMixin.java

@@ -0,0 +1,24 @@
+package btw.arminias.seasons.mixin;
+
+import btw.arminias.seasons.BiomeCustomSeason;
+import net.minecraft.src.BiomeGenBase;
+import net.minecraft.src.FoliageColorReloadListener;
+import net.minecraft.src.GrassColorReloadListener;
+import net.minecraft.src.ResourceManager;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin({GrassColorReloadListener.class, FoliageColorReloadListener.class})
+public class GrassColorReloadListenerMixin {
+
+    @Inject(method = "onResourceManagerReload", at = @At("RETURN"))
+    private void onResourceManagerReloadInject(ResourceManager par1, CallbackInfo ci) {
+        for (BiomeGenBase biome : BiomeGenBase.biomeList) {
+            if (biome != null) {
+                ((BiomeCustomSeason) biome).seasonsAddon$updateColorCache(true);
+            }
+        }
+    }
+}

src/main/java/btw/arminias/seasons/mixin/GrassColorReloadListenerMixin.java

@@ -7,13 +7,17 @@
 import net.minecraft.src.GuiButton;
 import net.minecraft.src.GuiCreateWorld;
 import net.minecraft.src.GuiScreen;
+import net.minecraft.src.GuiTextField;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(GuiCreateWorld.class)
 public abstract class GuiCreateWorldMixin extends GuiScreen implements SettingsProvider {
+    @Shadow
+    private GuiTextField textboxWorldName;
     private GuiButton buttonSeasonSettings;
     private SeasonSettings settings = SeasonSettings.REALISTIC;
 
@@ -29,7 +33,7 @@ public abstract class GuiCreateWorldMixin extends GuiScreen implements SettingsP
 
     @Inject(method = "initGui", at = @At("RETURN"))
     public void initGuiInject(CallbackInfo ci) {
-        this.buttonSeasonSettings = new GuiButton(73, 320, 60, 98, 20, "Seasons Settings");
+        this.buttonSeasonSettings = new GuiButton(73, ((GuiTextFieldAccessor) textboxWorldName).getXPos() + ((GuiTextFieldAccessor) textboxWorldName).getWidth() + 2, ((GuiTextFieldAccessor) textboxWorldName).getYPos(), 98, 20, "Seasons Settings");
         this.buttonList.add(this.buttonSeasonSettings);
     }
 

src/main/java/btw/arminias/seasons/mixin/GuiCreateWorldMixin.java

@@ -0,0 +1,17 @@
+package btw.arminias.seasons.mixin;
+
+import net.minecraft.src.GuiTextField;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(GuiTextField.class)
+public interface GuiTextFieldAccessor {
+    @Accessor
+    int getXPos();
+
+    @Accessor
+    int getYPos();
+
+    @Accessor
+    int getWidth();
+}

src/main/java/btw/arminias/seasons/mixin/GuiTextFieldAccessor.java

@@ -15,6 +15,7 @@
     "CropsBlockMixin",
     "DailyGrowthCropsBlockMixin",
     "EntityRendererMixin",
+    "GuiTextFieldAccessor",
     "HempCropBlockMixin",
     "IceBlockMixin",
     "LeavesBlockMixin",
@@ -27,6 +28,7 @@
     "WorldProviderMixin"
   ],
   "client": [
+    "GrassColorReloadListenerMixin",
     "GuiCreateWorldMixin"
   ],
   "injectors": {