Merge pull request #20 from GTNewHorizons/Blood-Frames

Addition of Blood Magic Frames
GTNewHorizons · Apr 30, 2023 · 3d562d0 · 3d562d0
2 parents e053b01 + 9f17d8c
commit 3d562d0
Show file tree

Hide file tree

Showing 128 changed files with 1,361 additions and 627 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -2,9 +2,11 @@
 
 dependencies {
     compile('com.github.GTNewHorizons:ForestryMC:4.6.6:dev')
-    compile('com.github.GTNewHorizons:Baubles:1.0.1.14:dev')
 
+    compileOnly('com.github.GTNewHorizons:BloodMagic:1.4.0:dev')
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false}
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false}
+
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

diff --git a/src/main/java/magicbees/bees/Allele.java b/src/main/java/magicbees/bees/Allele.java
@@ -1,5 +1,17 @@
 package magicbees.bees;
 
+import net.minecraft.potion.Potion;
+
+import forestry.api.apiculture.EnumBeeChromosome;
+import forestry.api.apiculture.IAlleleBeeEffect;
+import forestry.api.apiculture.IAlleleBeeSpecies;
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IAlleleEffect;
+import forestry.api.genetics.IAlleleFlowers;
+import forestry.api.genetics.IAlleleRegistry;
+import forestry.api.genetics.IChromosomeType;
+import forestry.api.genetics.IFlowerProvider;
 import magicbees.api.MagicBeesAPI;
 import magicbees.bees.allele.effect.AlleleEffectCrumbling;
 import magicbees.bees.allele.effect.AlleleEffectCure;
@@ -27,20 +39,7 @@
 import magicbees.main.utils.compat.BotaniaHelper;
 import magicbees.main.utils.compat.ThaumcraftHelper;
 import magicbees.main.utils.compat.ThermalModsHelper;
-
-import net.minecraft.potion.Potion;
-
 import thaumcraft.api.nodes.NodeType;
-import forestry.api.apiculture.EnumBeeChromosome;
-import forestry.api.apiculture.IAlleleBeeEffect;
-import forestry.api.apiculture.IAlleleBeeSpecies;
-import forestry.api.genetics.AlleleManager;
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IAlleleEffect;
-import forestry.api.genetics.IAlleleFlowers;
-import forestry.api.genetics.IAlleleRegistry;
-import forestry.api.genetics.IChromosomeType;
-import forestry.api.genetics.IFlowerProvider;
 
 public class Allele implements IAllele {
 

diff --git a/src/main/java/magicbees/bees/BeeClassification.java b/src/main/java/magicbees/bees/BeeClassification.java
@@ -2,10 +2,10 @@
 
 import java.util.ArrayList;
 
-import magicbees.main.utils.LocalizationManager;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IClassification;
+import magicbees.main.utils.LocalizationManager;
 
 public enum BeeClassification implements IClassification {
 

diff --git a/src/main/java/magicbees/bees/BeeGenomeManager.java b/src/main/java/magicbees/bees/BeeGenomeManager.java
@@ -1,15 +1,14 @@
 package magicbees.bees;
 
-import magicbees.main.utils.ItemInterface;
-import magicbees.main.utils.compat.ExtraBeesHelper;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
 import forestry.api.apiculture.EnumBeeChromosome;
 import forestry.api.apiculture.EnumBeeType;
 import forestry.api.genetics.IAllele;
+import magicbees.main.utils.ItemInterface;
+import magicbees.main.utils.compat.ExtraBeesHelper;
 
 /**
  * Simply a class to hold all the functions to manage species' default genomes.

diff --git a/src/main/java/magicbees/bees/BeeIconProvider.java b/src/main/java/magicbees/bees/BeeIconProvider.java
@@ -2,15 +2,14 @@
 
 import java.util.Locale;
 
-import magicbees.main.CommonProxy;
-
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.apiculture.EnumBeeType;
 import forestry.api.apiculture.IBeeIconProvider;
+import magicbees.main.CommonProxy;
 
 public enum BeeIconProvider implements IBeeIconProvider {
 

diff --git a/src/main/java/magicbees/bees/BeeManager.java b/src/main/java/magicbees/bees/BeeManager.java
@@ -5,12 +5,6 @@
 import java.util.List;
 import java.util.Random;
 
-import magicbees.block.types.HiveType;
-import magicbees.item.types.DropType;
-import magicbees.main.Config;
-import magicbees.main.utils.Tuple;
-import magicbees.main.utils.compat.ExtraBeesHelper;
-
 import net.minecraft.item.ItemStack;
 
 import forestry.api.apiculture.EnumBeeType;
@@ -20,6 +14,11 @@
 import forestry.api.apiculture.IBeeRoot;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
+import magicbees.block.types.HiveType;
+import magicbees.item.types.DropType;
+import magicbees.main.Config;
+import magicbees.main.utils.Tuple;
+import magicbees.main.utils.compat.ExtraBeesHelper;
 
 public class BeeManager {
 

diff --git a/src/main/java/magicbees/bees/BeeMutation.java b/src/main/java/magicbees/bees/BeeMutation.java
@@ -1,5 +1,13 @@
 package magicbees.bees;
 
+import net.minecraft.init.Blocks;
+import net.minecraftforge.common.BiomeDictionary;
+import net.minecraftforge.common.BiomeDictionary.Type;
+import net.minecraftforge.oredict.OreDictionary;
+
+import forestry.api.apiculture.IAlleleBeeSpecies;
+import forestry.api.apiculture.IBeeMutationCustom;
+import forestry.api.apiculture.IBeeMutationFactory;
 import magicbees.main.utils.LogHelper;
 import magicbees.main.utils.MoonPhase;
 import magicbees.main.utils.compat.AppliedEnergisticsHelper;
@@ -12,15 +20,6 @@
 import magicbees.main.utils.compat.ThaumcraftHelper;
 import magicbees.main.utils.compat.ThermalModsHelper;
 
-import net.minecraft.init.Blocks;
-import net.minecraftforge.common.BiomeDictionary;
-import net.minecraftforge.common.BiomeDictionary.Type;
-import net.minecraftforge.oredict.OreDictionary;
-
-import forestry.api.apiculture.IAlleleBeeSpecies;
-import forestry.api.apiculture.IBeeMutationCustom;
-import forestry.api.apiculture.IBeeMutationFactory;
-
 public class BeeMutation {
 
     private static IBeeMutationFactory beeMutationFactory = forestry.api.apiculture.BeeManager.beeMutationFactory;

diff --git a/src/main/java/magicbees/bees/BeeProductHelper.java b/src/main/java/magicbees/bees/BeeProductHelper.java
@@ -2,6 +2,11 @@
 
 import static magicbees.bees.BeeSpecies.*;
 
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
 import magicbees.item.types.CombType;
 import magicbees.item.types.DropType;
 import magicbees.item.types.NuggetType;
@@ -20,11 +25,6 @@
 import magicbees.main.utils.compat.ThaumcraftHelper;
 import magicbees.main.utils.compat.ThermalModsHelper;
 
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
 public class BeeProductHelper {
 
     public static void initBaseProducts() {

diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java
@@ -1,13 +1,5 @@
 package magicbees.bees;
 
-import magicbees.main.utils.compat.AppliedEnergisticsHelper;
-import magicbees.main.utils.compat.ArsMagicaHelper;
-import magicbees.main.utils.compat.BotaniaHelper;
-import magicbees.main.utils.compat.EquivalentExchangeHelper;
-import magicbees.main.utils.compat.RedstoneArsenalHelper;
-import magicbees.main.utils.compat.ThaumcraftHelper;
-import magicbees.main.utils.compat.ThermalModsHelper;
-
 import net.minecraft.item.ItemStack;
 
 import forestry.api.apiculture.EnumBeeChromosome;
@@ -24,6 +16,13 @@
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleTolerance;
 import forestry.api.genetics.IClassification;
+import magicbees.main.utils.compat.AppliedEnergisticsHelper;
+import magicbees.main.utils.compat.ArsMagicaHelper;
+import magicbees.main.utils.compat.BotaniaHelper;
+import magicbees.main.utils.compat.EquivalentExchangeHelper;
+import magicbees.main.utils.compat.RedstoneArsenalHelper;
+import magicbees.main.utils.compat.ThaumcraftHelper;
+import magicbees.main.utils.compat.ThermalModsHelper;
 
 public enum BeeSpecies {
 

diff --git a/src/main/java/magicbees/bees/HiveDescription.java b/src/main/java/magicbees/bees/HiveDescription.java
@@ -5,15 +5,6 @@
 import java.util.Locale;
 import java.util.Random;
 
-import magicbees.block.types.HiveType;
-import magicbees.main.Config;
-import magicbees.main.utils.BlockUtil;
-import magicbees.main.utils.LogHelper;
-import magicbees.world.feature.FeatureOreVein;
-import magicbees.world.feature.HiveGenNether;
-import magicbees.world.feature.HiveGenOblivion;
-import magicbees.world.feature.HiveGenUnderground;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
@@ -25,6 +16,14 @@
 import forestry.api.apiculture.hives.IHiveGen;
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
+import magicbees.block.types.HiveType;
+import magicbees.main.Config;
+import magicbees.main.utils.BlockUtil;
+import magicbees.main.utils.LogHelper;
+import magicbees.world.feature.FeatureOreVein;
+import magicbees.world.feature.HiveGenNether;
+import magicbees.world.feature.HiveGenOblivion;
+import magicbees.world.feature.HiveGenUnderground;
 
 public enum HiveDescription implements IHiveDescription {
 

diff --git a/src/main/java/magicbees/bees/MoonPhaseMutationBonus.java b/src/main/java/magicbees/bees/MoonPhaseMutationBonus.java
@@ -1,14 +1,13 @@
 package magicbees.bees;
 
-import magicbees.main.utils.LocalizationManager;
-import magicbees.main.utils.MoonPhase;
-
 import net.minecraft.world.World;
 
 import forestry.api.core.IClimateProvider;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IGenome;
 import forestry.api.genetics.IMutationCondition;
+import magicbees.main.utils.LocalizationManager;
+import magicbees.main.utils.MoonPhase;
 
 // There is a bonus to this mutation during moon phases...
 public class MoonPhaseMutationBonus implements IMutationCondition {

diff --git a/src/main/java/magicbees/bees/MoonPhaseMutationRestriction.java b/src/main/java/magicbees/bees/MoonPhaseMutationRestriction.java
@@ -1,14 +1,13 @@
 package magicbees.bees;
 
-import magicbees.main.utils.LocalizationManager;
-import magicbees.main.utils.MoonPhase;
-
 import net.minecraft.world.World;
 
 import forestry.api.core.IClimateProvider;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IGenome;
 import forestry.api.genetics.IMutationCondition;
+import magicbees.main.utils.LocalizationManager;
+import magicbees.main.utils.MoonPhase;
 
 public class MoonPhaseMutationRestriction implements IMutationCondition {
 

diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectCrumbling.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectCrumbling.java
@@ -2,9 +2,6 @@
 
 import java.util.HashMap;
 
-import magicbees.bees.AlleleEffect;
-import magicbees.bees.BeeManager;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
@@ -16,6 +13,8 @@
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.genetics.IEffectData;
+import magicbees.bees.AlleleEffect;
+import magicbees.bees.BeeManager;
 
 public class AlleleEffectCrumbling extends AlleleEffect {
 

diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectCure.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectCure.java
@@ -2,15 +2,14 @@
 
 import java.util.List;
 
-import magicbees.bees.AlleleEffect;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.genetics.IEffectData;
+import magicbees.bees.AlleleEffect;
 
 public class AlleleEffectCure extends AlleleEffect {
 

diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java
@@ -7,24 +7,23 @@
 import java.util.Collections;
 import java.util.List;
 
-import magicbees.bees.AlleleEffect;
-import magicbees.bees.BeeManager;
-import magicbees.main.Config;
-import magicbees.main.utils.BlockUtil;
-import magicbees.main.utils.compat.thaumcraft.NodeHelper;
-
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.nodes.INode;
 import forestry.api.apiculture.IAlleleBeeAcceleratableEffect;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.genetics.IEffectData;
+import magicbees.bees.AlleleEffect;
+import magicbees.bees.BeeManager;
+import magicbees.main.Config;
+import magicbees.main.utils.BlockUtil;
+import magicbees.main.utils.compat.thaumcraft.NodeHelper;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.api.nodes.INode;
 
 public class AlleleEffectEmpowering extends AlleleEffect implements IAlleleBeeAcceleratableEffect {
 

diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeConversion.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeConversion.java
@@ -2,20 +2,19 @@
 
 import java.util.List;
 
-import magicbees.bees.AlleleEffect;
-import magicbees.bees.BeeManager;
-import magicbees.main.utils.BlockUtil;
-import magicbees.main.utils.compat.thaumcraft.NodeHelper;
-
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 
-import thaumcraft.api.nodes.NodeType;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeHousing;
 import forestry.api.apiculture.IBeeModifier;
 import forestry.api.genetics.IEffectData;
+import magicbees.bees.AlleleEffect;
+import magicbees.bees.BeeManager;
+import magicbees.main.utils.BlockUtil;
+import magicbees.main.utils.compat.thaumcraft.NodeHelper;
+import thaumcraft.api.nodes.NodeType;
 
 public class AlleleEffectNodeConversion extends AlleleEffect {