Merge remote-tracking branch 'origin/7.1' into 7.1

gradle.properties

@@ -7,7 +7,7 @@ bta_version=7.1-pre1a
 loader_version=0.14.19-babric.3-bta
 
 # Mod
-mod_version=3.4.8
+mod_version=3.4.9
 mod_group=turniplabs
 mod_name=halplibe
 

src/main/java/turniplabs/halplibe/HalpLibe.java

@@ -4,36 +4,26 @@
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
-import net.minecraft.client.entity.fx.EntityFireflyFX;
-import net.minecraft.client.render.block.model.BlockModelRenderBlocks;
-import net.minecraft.client.sound.block.BlockSounds;
 import net.minecraft.core.Global;
 import net.minecraft.core.block.Block;
 import net.minecraft.core.block.BlockLanternFirefly;
-import net.minecraft.core.block.tag.BlockTags;
 import net.minecraft.core.data.gamerule.GameRuleBoolean;
 import net.minecraft.core.data.gamerule.GameRules;
 import net.minecraft.core.item.Item;
-import net.minecraft.core.item.ItemPlaceable;
 import net.minecraft.core.item.ItemStack;
-import net.minecraft.core.item.tag.ItemTags;
-import net.minecraft.core.util.helper.MathHelper;
 import net.minecraft.core.world.biome.Biome;
 import net.minecraft.core.world.biome.Biomes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import turniplabs.halplibe.helper.*;
-import turniplabs.halplibe.mixin.accessors.EntityFireflyFXAccessor;
 import turniplabs.halplibe.util.FireflyColor;
-import turniplabs.halplibe.util.GameStartEntrypoint;
 import turniplabs.halplibe.util.TomlConfigHandler;
 import turniplabs.halplibe.util.achievements.AchievementPage;
 import turniplabs.halplibe.util.achievements.VanillaAchievementsPage;
 import turniplabs.halplibe.util.toml.Toml;
 import turniplabs.halplibe.util.version.PacketModList;
 
 import java.util.HashMap;
-import java.util.Random;
 
 public class HalpLibe implements ModInitializer, PreLaunchEntrypoint {
     public static final String MOD_ID = "halplibe";
@@ -113,7 +103,7 @@ public void onInitialize() {
     public static FireflyColor fireflyBlue;
     public static FireflyColor fireflyRed;
 
-    public static GameRuleBoolean UNLOCK_ALL_RECIPES = (GameRuleBoolean) GameRules.register(new GameRuleBoolean("unlockAllRecipes", false));
+    public static GameRuleBoolean UNLOCK_ALL_RECIPES = GameRules.register(new GameRuleBoolean("unlockAllRecipes", false));
 
     @Override
     public void onPreLaunch() {

src/main/java/turniplabs/halplibe/helper/AchievementHelper.java

@@ -5,7 +5,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class AchievementHelper {
+abstract public class AchievementHelper {
     private static final List<AchievementPage> pages = new ArrayList<>();
 
     public static List<AchievementPage> getPages() {

src/main/java/turniplabs/halplibe/helper/ArmorHelper.java

@@ -4,7 +4,7 @@
 import net.minecraft.core.util.helper.DamageType;
 import turniplabs.halplibe.util.ArmorMaterialMixinInterface;
 
-public class ArmorHelper {
+abstract public class ArmorHelper {
 
     /**
      * Damage parameters can be more than 100%. Armor durability will be a bit different from in-game.

src/main/java/turniplabs/halplibe/helper/BlockBuilder.java

@@ -15,11 +15,7 @@
 import org.apache.commons.lang3.StringUtils;
 import turniplabs.halplibe.mixin.accessors.BlockFireAccessor;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class BlockBuilder implements Cloneable {

src/main/java/turniplabs/halplibe/helper/BlockHelper.java

@@ -8,7 +8,7 @@
 
 import java.util.function.Consumer;
 
-public class BlockHelper {
+abstract public class BlockHelper {
 
     public static int highestVanilla;
 

src/main/java/turniplabs/halplibe/helper/CommandHelper.java

@@ -12,7 +12,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 
-public class CommandHelper {
+abstract public class CommandHelper {
     @ApiStatus.Internal // used in CommandsCoreMixin
     private static final List<Command> coreCommands = new ArrayList<>();
     @ApiStatus.Internal // used in CommandsClientMixin

src/main/java/turniplabs/halplibe/helper/CreativeHelper.java

@@ -4,7 +4,7 @@
 import net.minecraft.core.item.ItemStack;
 import turniplabs.halplibe.util.CreativeEntry;
 
-public class CreativeHelper {
+abstract public class CreativeHelper {
     /**
      * @param itemToAdd The itemstack to be added to the creative inventory list
      * @param priority the priority for the item to be added, lower numbers appear higher in the list. Default is 1000

src/main/java/turniplabs/halplibe/helper/EntityHelper.java

@@ -13,7 +13,7 @@
 
 import java.util.Map;
 
-public class EntityHelper {
+abstract public class EntityHelper {
     /**
      * @deprecated No longer works serverside as of BTA 7.1 due to the removal of "Minecraft.class" from the server jar
      * Replaced by {@link Core#createEntity(Class, int, String)} and {@link Client#assignEntityRenderer(Class, EntityRenderer)}

src/main/java/turniplabs/halplibe/helper/FireflyHelper.java

@@ -1,8 +1,6 @@
 package turniplabs.halplibe.helper;
 
-import net.minecraft.client.entity.fx.EntityFireflyFX;
 import net.minecraft.core.block.BlockLanternFirefly;
-import turniplabs.halplibe.mixin.accessors.EntityFireflyFXAccessor;
 import turniplabs.halplibe.util.FireflyColor;
 import turniplabs.halplibe.util.IFireflyColor;
 

src/main/java/turniplabs/halplibe/helper/ItemHelper.java

@@ -15,7 +15,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-public class ItemHelper {
+abstract public class ItemHelper {
 
 	public static int highestVanilla;
 

src/main/java/turniplabs/halplibe/helper/ModVersionHelper.java

@@ -12,7 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class ModVersionHelper {
+abstract public class ModVersionHelper {
     protected static boolean isDev = FabricLoader.getInstance().isDevelopmentEnvironment();
     protected static List<ModInfo> localMods = new ArrayList<>();
     protected static List<ModInfo> serverMods = null;

src/main/java/turniplabs/halplibe/helper/NetworkHelper.java

@@ -10,7 +10,7 @@
 import java.util.TreeSet;
 import java.util.function.Consumer;
 
-public class NetworkHelper {
+abstract public class NetworkHelper {
     private static final TreeSet<NetworkEntry> ENTRIES = new TreeSet<>();
     private static boolean locked = false;
 

src/main/java/turniplabs/halplibe/helper/ParticleHelper.java

@@ -12,7 +12,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class ParticleHelper {
+abstract public class ParticleHelper {
     public static Map<String, Class<? extends EntityFX>> particlesOld = new HashMap<>();
     public static Map<String, ParticleLambda> particles = new HashMap<>();
 

src/main/java/turniplabs/halplibe/helper/RecipeBuilder.java

@@ -1,32 +1,16 @@
 package turniplabs.halplibe.helper;
 
 import com.b100.utils.FileUtils;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.TypeAdapter;
+import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import net.minecraft.core.Global;
 import net.minecraft.core.WeightedRandomBag;
 import net.minecraft.core.WeightedRandomLootObject;
 import net.minecraft.core.data.registry.Registries;
-import net.minecraft.core.data.registry.recipe.HasJsonAdapter;
-import net.minecraft.core.data.registry.recipe.RecipeEntryBase;
-import net.minecraft.core.data.registry.recipe.RecipeGroup;
-import net.minecraft.core.data.registry.recipe.RecipeNamespace;
-import net.minecraft.core.data.registry.recipe.RecipeSymbol;
-import net.minecraft.core.data.registry.recipe.adapter.ItemStackJsonAdapter;
-import net.minecraft.core.data.registry.recipe.adapter.RecipeJsonAdapter;
-import net.minecraft.core.data.registry.recipe.adapter.RecipeSymbolJsonAdapter;
-import net.minecraft.core.data.registry.recipe.adapter.WeightedRandomBagJsonAdapter;
-import net.minecraft.core.data.registry.recipe.adapter.WeightedRandomLootObjectJsonAdapter;
+import net.minecraft.core.data.registry.recipe.*;
+import net.minecraft.core.data.registry.recipe.adapter.*;
 import net.minecraft.core.item.ItemStack;
-import turniplabs.halplibe.helper.recipeBuilders.RecipeBuilderBlastFurnace;
-import turniplabs.halplibe.helper.recipeBuilders.RecipeBuilderFurnace;
-import turniplabs.halplibe.helper.recipeBuilders.RecipeBuilderShaped;
-import turniplabs.halplibe.helper.recipeBuilders.RecipeBuilderShapeless;
-import turniplabs.halplibe.helper.recipeBuilders.RecipeBuilderTrommel;
+import turniplabs.halplibe.helper.recipeBuilders.*;
 import turniplabs.halplibe.helper.recipeBuilders.modifiers.BlastFurnaceModifier;
 import turniplabs.halplibe.helper.recipeBuilders.modifiers.FurnaceModifier;
 import turniplabs.halplibe.helper.recipeBuilders.modifiers.TrommelModifier;

src/main/java/turniplabs/halplibe/helper/RecipeHelper.java

@@ -12,7 +12,7 @@
  * Replace by the RecipeBuilder
  */
 @Deprecated
-public class RecipeHelper {
+abstract public class RecipeHelper {
     @Deprecated
     public static final CraftingManager craftingManager = CraftingManager.getInstance();
     @Deprecated

src/main/java/turniplabs/halplibe/helper/RegistryHelper.java

@@ -5,7 +5,7 @@
 import java.util.ArrayList;
 import java.util.function.Consumer;
 
-public class RegistryHelper {
+abstract public class RegistryHelper {
 	private static final ArrayList<Runnable> registryFunctions = new ArrayList<>();
 	private static final ArrayList<Runnable> configuredRegistryFunctions = new ArrayList<>();
 	private static final ArrayList<Runnable> smartRegistryFunctions = new ArrayList<>();

src/main/java/turniplabs/halplibe/helper/SoundHelper.java

@@ -12,7 +12,7 @@
 import java.util.Hashtable;
 
 
-public class SoundHelper {
+abstract public class SoundHelper {
     private static final Hashtable<String, String> fileCache = new Hashtable<>();
     public static final File appDirectory;
     public static final File soundDirectory;

src/main/java/turniplabs/halplibe/helper/TextureHelper.java

@@ -2,18 +2,14 @@
 
 import net.minecraft.core.Global;
 import net.minecraft.core.block.Block;
-import turniplabs.halplibe.util.BlockCoords;
-import turniplabs.halplibe.util.DirectoryManager;
-import turniplabs.halplibe.util.ItemCoords;
-import turniplabs.halplibe.util.ParticleCoords;
-import turniplabs.halplibe.util.TextureHandler;
+import turniplabs.halplibe.util.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class TextureHelper {
+abstract public class TextureHelper {
     public static List<String> supportedImageFormats = new ArrayList<>();
     static {
         supportedImageFormats.add("BMP");

src/main/java/turniplabs/halplibe/mixin/mixins/EntityFireflyClusterMixin.java

@@ -22,7 +22,10 @@
 import turniplabs.halplibe.util.FireflyColor;
 import turniplabs.halplibe.util.IFireflyColor;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Debug(export = true)
 @Mixin(value = EntityFireflyCluster.class, remap = false)
@@ -39,30 +42,8 @@ public EntityFireflyClusterMixin(World world) {
     public void spawnInit() {
         super.init();
         Biome currentBiome = this.world.getBlockBiome((int)this.x, (int)this.y, (int)this.z);
-        FireflyColor finalColor = null;
-        List<FireflyColor> colors = FireflyHelper.registeredColors;
-
-        for (FireflyColor color : colors) {
-            Biome[] spawnBiomes = color.getSpawnBiomes();
-            if (spawnBiomes != null) {
-                for (Biome spawnBiome : spawnBiomes) {
-                    if (spawnBiome == currentBiome) {
-                        finalColor = color;
-                        break;
-                    }
-                }
-
-                if (finalColor != null) {
-                    break;
-                }
-            }
-        }
-
-        if (finalColor == null) {
-            finalColor = HalpLibe.fireflyGreen;
-        }
-
-        halplibe$setColor(finalColor);
+        FireflyColor color = halplibe$getColourForBiome(currentBiome);
+        halplibe$setColor(color);
     }
 
     @Inject(
@@ -126,19 +107,28 @@ public void spawnInit() {
     @Unique
     private FireflyColor halplibe$getColourForBiome(Biome currentBiome) {
         List<FireflyColor> colors = FireflyHelper.registeredColors;
+        List<FireflyColor> colorsWithThisBiome = new ArrayList<>();
 
+        float totalWeight = 0f;
         for (FireflyColor color : colors) {
-            Biome[] spawnBiomes = color.getSpawnBiomes();
-
-            if (spawnBiomes != null) {
-                for (Biome biome : spawnBiomes) {
-                    if (biome == currentBiome) {
-                        return color;
-                    }
-                }
+            Float weight = color.getBiomeAndWeights().get(currentBiome);
+            if (weight != null) {
+                totalWeight += weight;
+                colorsWithThisBiome.add(color);
             }
         }
 
-        return HalpLibe.fireflyGreen;
+        int index = 0;
+        float r = (float) Math.random() * totalWeight;
+        for (; index < colorsWithThisBiome.size() - 1; index++) {
+            r -= colorsWithThisBiome.get(index).getBiomeAndWeights().get(currentBiome);
+            if (r <= 0.0) break;
+        }
+
+        if (totalWeight == 0f) {
+            return HalpLibe.fireflyGreen;
+        } else {
+          return colorsWithThisBiome.get(index);
+        }
     }
 }