Added config option for Aquaculture fish to be used for breeding cats…

…/ocelots
TeamMetallurgy · Jun 21, 2020 · fca57d6 · fca57d6
1 parent 45c9359
commit fca57d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 minecraft_version=1.15.2
-forge_version=31.1.87
-mappings=20200514-1.15.1
-mod_version=2.0.14
-jei_version=6.0.0.4
+forge_version=31.2.21
+mappings=20200621-1.15.1
+mod_version=2.0.15
+jei_version=6.0.2.6
 
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
diff --git a/src/main/java/com/teammetallurgy/aquaculture/Aquaculture.java b/src/main/java/com/teammetallurgy/aquaculture/Aquaculture.java
@@ -1,6 +1,5 @@
 package com.teammetallurgy.aquaculture;
 
-import com.teammetallurgy.aquaculture.block.WormFarmBlock;
 import com.teammetallurgy.aquaculture.client.ClientHandler;
 import com.teammetallurgy.aquaculture.init.AquaEntities;
 import com.teammetallurgy.aquaculture.init.AquaItems;
@@ -56,7 +55,9 @@ private void setupCommon(FMLCommonSetupEvent event) {
             AquaEntities.setSpawnPlacement();
             AquaEntities.addEntitySpawns();
             FishReadFromJson.addFishSpawns();
-            FishRegistry.addCatBreeding();
+            if (AquaConfig.BASIC_OPTIONS.aqFishToBreedCats.get()) {
+                FishRegistry.addCatBreeding();
+            }
         });
     }
 

diff --git a/src/main/java/com/teammetallurgy/aquaculture/misc/AquaConfig.java b/src/main/java/com/teammetallurgy/aquaculture/misc/AquaConfig.java
@@ -18,13 +18,15 @@ public static class BasicOptions {
         public ForgeConfigSpec.BooleanValue enableFishSpawning;
         public ForgeConfigSpec.BooleanValue randomWeight;
         public ForgeConfigSpec.BooleanValue compostableFish;
+        public ForgeConfigSpec.BooleanValue aqFishToBreedCats;
         public ForgeConfigSpec.BooleanValue debugMode;
 
         BasicOptions(ForgeConfigSpec.Builder builder) {
             builder.push(BASIC_OPTIONS);
             enableFishSpawning = builder.comment("Enable fish mob spawning? Weight & biomes can be modified in the Aquaculture fish loot table").define("Enable fish spawning?", true);
             randomWeight = builder.define("Enable weight for fish? Useful for fishing competitions", false);
             compostableFish = builder.define("Should fish be added as compostables for the composter/worm farm? (Based on fish, or weight if enabled)", true);
+            aqFishToBreedCats = builder.define("Should Aquaculture fish be able to be used to breed cats & ocelots?", true);
             debugMode = builder.define("Enable debug mode? (Enables additional logging)", false);
             builder.pop();
         }