Switched back to using BiomeDictionary types for loot tables

TeamMetallurgy · Dec 9, 2020 · 3efdc22 · 3efdc22
1 parent 866266e
commit 3efdc22
Show file tree

Hide file tree

Showing 17 changed files with 411 additions and 406 deletions.
diff --git a/src/main/java/com/teammetallurgy/aquaculture/Aquaculture.java b/src/main/java/com/teammetallurgy/aquaculture/Aquaculture.java
@@ -6,7 +6,7 @@
 import com.teammetallurgy.aquaculture.init.AquaEntities;
 import com.teammetallurgy.aquaculture.init.AquaItems;
 import com.teammetallurgy.aquaculture.init.FishRegistry;
-import com.teammetallurgy.aquaculture.loot.BiomePropertiesCheck;
+import com.teammetallurgy.aquaculture.loot.BiomeTagCheck;
 import com.teammetallurgy.aquaculture.loot.FishWeightHandler;
 import com.teammetallurgy.aquaculture.misc.AquaConfig;
 import cpw.mods.modlauncher.Environment;
@@ -42,7 +42,7 @@ public ItemStack createIcon() {
             return new ItemStack(AquaItems.IRON_FISHING_ROD);
         }
     };
-    public static final LootConditionType BIOME_TAG_CHECK = LootConditionManager.register(new ResourceLocation(MOD_ID, "biome_properties_check").toString(), new BiomePropertiesCheck.Serializer());
+    public static final LootConditionType BIOME_TAG_CHECK = LootConditionManager.register(new ResourceLocation(MOD_ID, "biome_tag_check").toString(), new BiomeTagCheck.Serializer());
 
     public Aquaculture() {
         instance = this;

diff --git a/src/main/java/com/teammetallurgy/aquaculture/api/fishing/Hooks.java b/src/main/java/com/teammetallurgy/aquaculture/api/fishing/Hooks.java
@@ -3,7 +3,6 @@
 import com.teammetallurgy.aquaculture.Aquaculture;
 import com.teammetallurgy.aquaculture.misc.AquacultureSounds;
 import net.minecraft.tags.FluidTags;
-import net.minecraft.util.SoundEvents;
 import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fml.common.Mod;

diff --git a/src/main/java/com/teammetallurgy/aquaculture/block/WormFarmBlock.java b/src/main/java/com/teammetallurgy/aquaculture/block/WormFarmBlock.java
@@ -16,7 +16,10 @@
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.*;
+import net.minecraft.util.ActionResultType;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
+import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.MathHelper;

diff --git a/src/main/java/com/teammetallurgy/aquaculture/block/tileentity/TackleBoxTileEntity.java b/src/main/java/com/teammetallurgy/aquaculture/block/tileentity/TackleBoxTileEntity.java
@@ -12,7 +12,6 @@
 import net.minecraft.tileentity.ITickableTileEntity;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.SoundEvent;
-import net.minecraft.util.SoundEvents;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;

diff --git a/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishEntity.java b/src/main/java/com/teammetallurgy/aquaculture/entity/AquaFishEntity.java
@@ -18,7 +18,6 @@
 import net.minecraft.tags.FluidTags;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.SoundEvent;
-import net.minecraft.util.SoundEvents;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.IWorld;

diff --git a/src/main/java/com/teammetallurgy/aquaculture/entity/TurtleLandEntity.java b/src/main/java/com/teammetallurgy/aquaculture/entity/TurtleLandEntity.java
@@ -47,7 +47,6 @@ public static AttributeModifierMap.MutableAttribute getAttributes() {
         return MobEntity.func_233666_p_().createMutableAttribute(Attributes.MAX_HEALTH, 10.0D).createMutableAttribute(Attributes.MOVEMENT_SPEED, 0.1D).createMutableAttribute(Attributes.ARMOR, 1.5D);
     }
 
-
     @Override
     public boolean isBreedingItem(@Nonnull ItemStack stack) {
         return this.getTurtleEdible().test(stack);
@@ -59,7 +58,7 @@ public Ingredient getTurtleEdible() {
 
     @Override
     @Nullable
-    public AgeableEntity func_241840_a(ServerWorld world, @Nonnull AgeableEntity ageableEntity) {
+    public AgeableEntity func_241840_a(@Nonnull ServerWorld world, @Nonnull AgeableEntity ageableEntity) {
         return (AgeableEntity) this.getType().create(this.world);
     }
 

diff --git a/src/main/java/com/teammetallurgy/aquaculture/init/AquaEntities.java b/src/main/java/com/teammetallurgy/aquaculture/init/AquaEntities.java
@@ -46,10 +46,10 @@ public class AquaEntities {
     public static final EntityType<WaterArrowEntity> WATER_ARROW = register("water_arrow", EntityType.Builder.<WaterArrowEntity>create(WaterArrowEntity::new, EntityClassification.MISC)
             .size(0.5F, 0.5F)
             .setCustomClientFactory(WaterArrowEntity::new));
-    public static final EntityType<TurtleLandEntity> BOX_TURTLE = registerMob("box_turtle", 1, 2, 9, BiomeDictionary.Type.SWAMP, null, 0x7F8439, 0x5D612A,
+    public static final EntityType<TurtleLandEntity> BOX_TURTLE = registerMob("box_turtle", 1, 2, 10, BiomeDictionary.Type.SWAMP, null, 0x7F8439, 0x5D612A,
             EntityType.Builder.create(TurtleLandEntity::new, EntityClassification.CREATURE)
                     .size(0.5F, 0.25F));
-    public static final EntityType<TurtleLandEntity> ARRAU_TURTLE = registerMob("arrau_turtle", 1, 2, 6, BiomeDictionary.Type.JUNGLE, null, 0x71857A, 0x4F6258,
+    public static final EntityType<TurtleLandEntity> ARRAU_TURTLE = registerMob("arrau_turtle", 1, 2, 8, BiomeDictionary.Type.JUNGLE, null, 0x71857A, 0x4F6258,
             EntityType.Builder.create(TurtleLandEntity::new, EntityClassification.CREATURE)
                     .size(0.5F, 0.25F));
     public static final EntityType<TurtleLandEntity> STARSHELL_TURTLE = registerMob("starshell_turtle", 1, 2, 5, BiomeDictionaryHelper.TWILIGHT, null, 0xDCE2E5, 0x464645,

diff --git a/src/main/java/com/teammetallurgy/aquaculture/item/ItemMessageInABottle.java b/src/main/java/com/teammetallurgy/aquaculture/item/ItemMessageInABottle.java
@@ -6,7 +6,10 @@
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.*;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.util.Util;
 import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.world.World;
 

diff --git a/src/main/java/com/teammetallurgy/aquaculture/loot/BiomePropertiesPredicate.java b/src/main/java/com/teammetallurgy/aquaculture/loot/BiomePropertiesPredicate.java
diff --git a/...quaculture/loot/BiomePropertiesCheck.java → ...lurgy/aquaculture/loot/BiomeTagCheck.java b/...quaculture/loot/BiomePropertiesCheck.java → ...lurgy/aquaculture/loot/BiomeTagCheck.java
@@ -13,10 +13,10 @@
 
 import javax.annotation.Nonnull;
 
-public class BiomePropertiesCheck implements ILootCondition {
-    private final BiomePropertiesPredicate predicate;
+public class BiomeTagCheck implements ILootCondition {
+    private final BiomeTagPredicate predicate;
 
-    private BiomePropertiesCheck(BiomePropertiesPredicate predicate) {
+    private BiomeTagCheck(BiomeTagPredicate predicate) {
         this.predicate = predicate;
     }
 
@@ -32,17 +32,17 @@ public LootConditionType func_230419_b_() {
         return Aquaculture.BIOME_TAG_CHECK;
     }
 
-    public static class Serializer implements ILootSerializer<BiomePropertiesCheck> {
+    public static class Serializer implements ILootSerializer<BiomeTagCheck> {
 
         @Override
-        public void serialize(JsonObject json, BiomePropertiesCheck tagCheck, @Nonnull JsonSerializationContext context) {
+        public void serialize(JsonObject json, BiomeTagCheck tagCheck, @Nonnull JsonSerializationContext context) {
             json.add("predicate", tagCheck.predicate.serialize());
         }
 
         @Override
         @Nonnull
-        public BiomePropertiesCheck deserialize(JsonObject json, @Nonnull JsonDeserializationContext context) {
-            return new BiomePropertiesCheck(BiomePropertiesPredicate.deserialize(json.get("predicate")));
+        public BiomeTagCheck deserialize(JsonObject json, @Nonnull JsonDeserializationContext context) {
+            return new BiomeTagCheck(BiomeTagPredicate.deserialize(json.get("predicate")));
         }
     }
 }