Updated to BTA 7.1-pre2a!

build.gradle

@@ -110,7 +110,7 @@ dependencies {
 	implementation("org.apache.logging.log4j:log4j-1.2-api:${log4jVersion}")
 	include(implementation("org.apache.commons:commons-lang3:3.12.0"))
 
-	modImplementation "ModMenu:ModMenu:2.0.3"
+	modImplementation "ModMenu:ModMenu:2.0.4"
 }
 
 java {

gradle.properties

@@ -1,13 +1,13 @@
 org.gradle.jvmargs=-Xmx2G
 
 # BTA
-bta_version=7.1-pre1a
+bta_version=7.1-pre2a
 
 # Loader
-loader_version=0.14.19-babric.3-bta
+loader_version=0.15.6-babric.4-bta
 
 # Mod
-mod_version=3.4.14
+mod_version=3.4.15
 mod_group=turniplabs
 mod_name=halplibe
 

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

@@ -16,7 +16,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import turniplabs.halplibe.helper.*;
-import turniplabs.halplibe.util.FireflyColor;
 import turniplabs.halplibe.util.TomlConfigHandler;
 import turniplabs.halplibe.util.achievements.AchievementPage;
 import turniplabs.halplibe.util.achievements.VanillaAchievementsPage;
@@ -98,29 +97,11 @@ public void onInitialize() {
         LOGGER.info("HalpLibe initialized.");
     }
 
-    public static FireflyColor fireflyGreen;
-    public static FireflyColor fireflyOrange;
-    public static FireflyColor fireflyBlue;
-    public static FireflyColor fireflyRed;
-
     public static GameRuleBoolean UNLOCK_ALL_RECIPES = GameRules.register(new GameRuleBoolean("unlockAllRecipes", false));
 
     @Override
     public void onPreLaunch() {
         // Initializes halp statics first
         NetworkHelper.register(PacketModList.class, false, true); // Register Halplibe packets first
-
-        fireflyGreen = new FireflyColor(0, "fireflyGreen", new ItemStack(Item.lanternFireflyGreen), new Biome[]{Biomes.OVERWORLD_RAINFOREST, Biomes.OVERWORLD_SWAMPLAND, Biomes.OVERWORLD_FOREST, Biomes.OVERWORLD_SEASONAL_FOREST});
-        fireflyOrange = new FireflyColor(1, "fireflyOrange", new ItemStack(Item.lanternFireflyOrange), new Biome[]{Biomes.OVERWORLD_DESERT, Biomes.OVERWORLD_OUTBACK, Biomes.OVERWORLD_OUTBACK_GRASSY});
-        fireflyBlue = new FireflyColor(2, "fireflyBlue", new ItemStack(Item.lanternFireflyBlue), new Biome[]{Biomes.OVERWORLD_TAIGA, Biomes.OVERWORLD_TUNDRA, Biomes.OVERWORLD_BOREAL_FOREST, Biomes.OVERWORLD_GLACIER, Biomes.PARADISE_PARADISE});
-        fireflyRed = new FireflyColor(3, "fireflyRed", new ItemStack(Item.lanternFireflyRed), new Biome[]{Biomes.NETHER_NETHER});
-        FireflyHelper.createColor(fireflyGreen);
-        FireflyHelper.createColor(fireflyOrange);
-        FireflyHelper.createColor(fireflyBlue);
-        FireflyHelper.createColor(fireflyRed);
-        FireflyHelper.setColor((BlockLanternFirefly) Block.lanternFireflyGreen, fireflyGreen);
-        FireflyHelper.setColor((BlockLanternFirefly) Block.lanternFireflyOrange, fireflyOrange);
-        FireflyHelper.setColor((BlockLanternFirefly) Block.lanternFireflyBlue, fireflyBlue);
-        FireflyHelper.setColor((BlockLanternFirefly) Block.lanternFireflyRed, fireflyRed);
     }
 }

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

@@ -4,12 +4,12 @@
 import net.minecraft.client.render.block.color.BlockColorDispatcher;
 import net.minecraft.client.render.block.model.BlockModel;
 import net.minecraft.client.render.block.model.BlockModelDispatcher;
-import net.minecraft.client.sound.block.BlockSound;
-import net.minecraft.client.sound.block.BlockSoundDispatcher;
 import net.minecraft.core.block.Block;
 import net.minecraft.core.data.tag.Tag;
 import net.minecraft.core.item.Item;
 import net.minecraft.core.item.block.ItemBlock;
+import net.minecraft.core.sound.BlockSound;
+import net.minecraft.core.sound.BlockSoundDispatcher;
 import net.minecraft.core.util.helper.Side;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -571,7 +571,7 @@ public <T extends Block> T build(T block) {
         }
 
         if (blockDrop != null) {
-            block.setDropOverride(blockDrop);
+            block.setDropOverride(blockDrop.id);
         }
 
         if (blockSound != null) {

src/main/java/turniplabs/halplibe/helper/recipeBuilders/modifiers/BlastFurnaceModifier.java

@@ -5,7 +5,6 @@
 import net.minecraft.core.data.registry.recipe.RecipeSymbol;
 import net.minecraft.core.data.registry.recipe.entry.RecipeEntryBlastFurnace;
 import turniplabs.halplibe.helper.RecipeBuilder;
-import turniplabs.halplibe.util.IUnregister;
 
 public class BlastFurnaceModifier {
     protected RecipeGroup<RecipeEntryBlastFurnace> recipeGroup;
@@ -15,7 +14,7 @@ public BlastFurnaceModifier(String namespace){
     }
     @SuppressWarnings({"unchecked", "unused"})
     public BlastFurnaceModifier removeRecipe(String recipeID){
-        ((IUnregister<RecipeEntryBlastFurnace>)recipeGroup).bta_halplibe$unregister(recipeID);
+        recipeGroup.unregister(recipeID);
         return this;
     }
 }

src/main/java/turniplabs/halplibe/helper/recipeBuilders/modifiers/FurnaceModifier.java

@@ -5,7 +5,7 @@
 import net.minecraft.core.data.registry.recipe.RecipeSymbol;
 import net.minecraft.core.data.registry.recipe.entry.RecipeEntryFurnace;
 import turniplabs.halplibe.helper.RecipeBuilder;
-import turniplabs.halplibe.util.IUnregister;
+
 
 public class FurnaceModifier {
     protected RecipeGroup<RecipeEntryFurnace> recipeGroup;
@@ -15,7 +15,7 @@ public FurnaceModifier(String namespace){
     }
     @SuppressWarnings({"unchecked", "unused"})
     public FurnaceModifier removeRecipe(String recipeID){
-        ((IUnregister<RecipeEntryFurnace>)recipeGroup).bta_halplibe$unregister(recipeID);
+        recipeGroup.unregister(recipeID);
         return this;
     }
 }

src/main/java/turniplabs/halplibe/helper/recipeBuilders/modifiers/TrommelModifier.java

@@ -11,7 +11,6 @@
 import turniplabs.halplibe.helper.RecipeBuilder;
 import turniplabs.halplibe.mixin.accessors.WeightedRandomBagAccessor;
 import turniplabs.halplibe.mixin.accessors.WeightedRandomBagEntryAccessor;
-import turniplabs.halplibe.util.IUnregister;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,7 +29,7 @@ public TrommelModifier(String namespace, String key){
     @SuppressWarnings({"unchecked", "unused"})
     public void deleteRecipe(){
         RecipeGroup<RecipeEntryTrommel> recipeGroup = (RecipeGroup<RecipeEntryTrommel>) RecipeBuilder.getRecipeGroup(namespace, "trommel", new RecipeSymbol(Block.trommelActive.getDefaultStack()));
-        ((IUnregister<RecipeEntryFurnace>)recipeGroup).bta_halplibe$unregister(key);
+        recipeGroup.unregister(key);
     }
     @SuppressWarnings({"unused"})
     public TrommelModifier addEntry(WeightedRandomLootObject lootObject, double weight){

src/main/java/turniplabs/halplibe/helper/recipeBuilders/modifiers/WorkbenchModifier.java

@@ -5,7 +5,6 @@
 import net.minecraft.core.data.registry.recipe.RecipeSymbol;
 import net.minecraft.core.data.registry.recipe.entry.RecipeEntryCrafting;
 import turniplabs.halplibe.helper.RecipeBuilder;
-import turniplabs.halplibe.util.IUnregister;
 
 public class WorkbenchModifier {
     protected RecipeGroup<RecipeEntryCrafting<?, ?>> recipeGroup;
@@ -15,7 +14,7 @@ public WorkbenchModifier(String namespace){
     }
     @SuppressWarnings({"unchecked", "unused"})
     public WorkbenchModifier removeRecipe(String recipeID){
-        ((IUnregister<RecipeEntryCrafting<?, ?>>)recipeGroup).bta_halplibe$unregister(recipeID);
+        recipeGroup.unregister(recipeID);
         return this;
     }
 }

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

@@ -1,9 +1,9 @@
 package turniplabs.halplibe.mixin.mixins;
 
-import net.minecraft.client.sound.block.BlockSound;
-import net.minecraft.client.sound.block.BlockSoundDispatcher;
 import net.minecraft.client.util.dispatch.Dispatcher;
 import net.minecraft.core.block.Block;
+import net.minecraft.core.sound.BlockSound;
+import net.minecraft.core.sound.BlockSoundDispatcher;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;