1.16.5_2.4.2

- removed block models since using blockstates is faster and easier and less work - experimentally added some mysticalagriculture stuff already
wolfkidsounds · Jan 31, 2022 · 572f796 · 572f796
1 parent 1c5f2d6
commit 572f796
Show file tree

Hide file tree

Showing 185 changed files with 246 additions and 740 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle'
 
 group = 'wks.wolfkidsounds'
-version = '1.16.5_2.4.1_forge_snap'
+version = '1.16.5_2.4.2_forge_snap'
 
 java {
     archivesBaseName = 'wildplants'

diff --git a/src/main/java/wks/wolfkidsounds/wildplants/Wildplants.java b/src/main/java/wks/wolfkidsounds/wildplants/Wildplants.java
@@ -17,6 +17,7 @@
 import wks.wolfkidsounds.wildplants.config.features.harvestcraft.HarvestcraftConfig;
 import wks.wolfkidsounds.wildplants.config.features.immersiveengineering.ImmersiveEngineeringConfig;
 import wks.wolfkidsounds.wildplants.config.features.minecraft.MinecraftConfig;
+import wks.wolfkidsounds.wildplants.config.features.mysticalagriculture.MysticalAgricultureConfig;
 import wks.wolfkidsounds.wildplants.config.features.veggieway.VeggiewayConfig;
 import wks.wolfkidsounds.wildplants.items.ModItems;
 import wks.wolfkidsounds.wildplants.render.ModRenderers;
@@ -44,6 +45,7 @@ public Wildplants() {
         ModLoadingContext.get().registerConfig(net.minecraftforge.fml.config.ModConfig.Type.COMMON, ImmersiveEngineeringConfig.SPEC, "wildplants/features/immersiveengineering-common.toml");
         ModLoadingContext.get().registerConfig(net.minecraftforge.fml.config.ModConfig.Type.COMMON, HarvestcraftConfig.SPEC, "wildplants/features/harvestcraft2-common.toml");
         ModLoadingContext.get().registerConfig(net.minecraftforge.fml.config.ModConfig.Type.COMMON, VeggiewayConfig.SPEC, "wildplants/features/veggieway-common.toml");
+        ModLoadingContext.get().registerConfig(net.minecraftforge.fml.config.ModConfig.Type.COMMON, MysticalAgricultureConfig.SPEC, "wildplants/features/mysticalagriculture-common.toml");
 
         ModBlocks.register(eventBus);
         ModItems.register(eventBus);

diff --git a/src/main/java/wks/wolfkidsounds/wildplants/block/ModBlocks.java b/src/main/java/wks/wolfkidsounds/wildplants/block/ModBlocks.java
@@ -320,23 +320,6 @@ private static <T extends Block>RegistryObject<T> registerVeggiewayBlock(String
     //--------------------------------------------------------------------------------------------------
 
     //MYSTICAL_AGRICULTURE
-    //BASE
-    public static final RegistryObject<Block> MYSTICALAGRICULTURE_WILD_PROSPERITY_FLOWER = registerMysticalAgricultureBaseBlock("mysticalagriculture_wild_prosperity_flower",
-            () -> new FlowerBlock(Effects.INSTANT_HEALTH, 2, AbstractBlock.Properties.from(Blocks.DANDELION)));
-
-    public static final RegistryObject<Block> MYSTICALAGRICULTURE_WILD_SOULIUM_FLOWER = registerMysticalAgricultureBaseBlock("mysticalagriculture_wild_soulium_flower",
-            () -> new FlowerBlock(Effects.INSTANT_HEALTH, 2, AbstractBlock.Properties.from(Blocks.DANDELION)));
-
-    public static final RegistryObject<Block> MYSTICALAGRICULTURE_WILD_INFERIUM_FLOWER = registerMysticalAgricultureBaseBlock("mysticalagriculture_wild_inferium_flower",
-            () -> new FlowerBlock(Effects.INSTANT_HEALTH, 2, AbstractBlock.Properties.from(Blocks.DANDELION)));
-
-    private static <T extends Block>RegistryObject<T> registerMysticalAgricultureBaseBlock(String name, Supplier<T> block) {
-        RegistryObject<T> toReturn = BLOCKS.register(name, block);
-        if (MysticalAgricultureConfig.ENABLE_MYSTICALAGRICULTURE_BASE.get() && CompatConfig.ENABLE_MYSTICALAGRICULTURE.get() && CompatConfig.LOADED_MYSTICALAGRICULTURE) {registerBlockItem(name, toReturn);}
-        return toReturn;
-    }
-
-    //--------------------------------------------------------------------------------------------------
 
     //ELEMENTAL
     public static final RegistryObject<Block> MYSTICALAGRICULTURE_WILD_AIR_FLOWER = registerMysticalAgricultureElementalBlock("mysticalagriculture_wild_air_flower",

diff --git a/...dsounds/wildplants/config/features/industrialagriculture/IndustrialAgricultureConfig.java b/...dsounds/wildplants/config/features/industrialagriculture/IndustrialAgricultureConfig.java
@@ -0,0 +1,4 @@
+package wks.wolfkidsounds.wildplants.config.features.industrialagriculture;
+
+public class IndustrialAgricultureConfig {
+}
diff --git a/...lfkidsounds/wildplants/config/features/mysticalagriculture/MysticalAgricultureConfig.java b/...lfkidsounds/wildplants/config/features/mysticalagriculture/MysticalAgricultureConfig.java
@@ -1,6 +1,12 @@
 package wks.wolfkidsounds.wildplants.config.features.mysticalagriculture;
 
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.FlowerBlock;
+import net.minecraft.potion.Effects;
 import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.fml.RegistryObject;
 import wks.wolfkidsounds.wildplants.Wildplants;
 import wks.wolfkidsounds.wildplants.config.CompatConfig;
 
@@ -9,14 +15,34 @@ public class MysticalAgricultureConfig {
     public static final ForgeConfigSpec SPEC;
 
     //MYSTICALAGRICULTURE
-    public static ForgeConfigSpec.BooleanValue ENABLE_MYSTICALAGRICULTURE_BASE;
     public static ForgeConfigSpec.BooleanValue ENABLE_MYSTICALAGRICULTURE_ELEMENTAL;
     public static ForgeConfigSpec.BooleanValue ENABLE_MYSTICALAGRICULTURE_MOB_PASSIVE;
     public static ForgeConfigSpec.BooleanValue ENABLE_MYSTICALAGRICULTURE_MOB;
     public static ForgeConfigSpec.BooleanValue ENABLE_MYSTICALAGRICULTURE_BLOCKS;
     public static ForgeConfigSpec.BooleanValue ENABLE_MYSTICALAGRICULTURE_OTHER;
     public static ForgeConfigSpec.BooleanValue ENABLE_MYSTICALAGRICULTURE_RESOURCES;
     public static ForgeConfigSpec.BooleanValue ENABLE_MYSTICALAGRICULTURE_METALS;
+
+    //ELEMENTAL
+    public static ForgeConfigSpec.ConfigValue<String> AIR_BIOME_TYPE_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.ConfigValue<Integer> AIR_FREQUENCY_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.ConfigValue<Integer> AIR_PATCH_SIZE_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.BooleanValue AIR_ENABLED_MYSTICALAGRICULTURE;
+
+    public static ForgeConfigSpec.ConfigValue<String> EARTH_BIOME_TYPE_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.ConfigValue<Integer> EARTH_FREQUENCY_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.ConfigValue<Integer> EARTH_PATCH_SIZE_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.BooleanValue EARTH_ENABLED_MYSTICALAGRICULTURE;
+
+    public static ForgeConfigSpec.ConfigValue<String> WATER_BIOME_TYPE_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.ConfigValue<Integer> WATER_FREQUENCY_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.ConfigValue<Integer> WATER_PATCH_SIZE_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.BooleanValue WATER_ENABLED_MYSTICALAGRICULTURE;
+
+    public static ForgeConfigSpec.ConfigValue<String> FIRE_BIOME_TYPE_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.ConfigValue<Integer> FIRE_FREQUENCY_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.ConfigValue<Integer> FIRE_PATCH_SIZE_MYSTICALAGRICULTURE;
+    public static ForgeConfigSpec.BooleanValue FIRE_ENABLED_MYSTICALAGRICULTURE;
 
     static {
         Wildplants.LOGGER.debug("init-minecraft-feature-config");
@@ -30,52 +56,96 @@ public class MysticalAgricultureConfig {
                         "Generic Types: [MESA, FOREST, PLAINS, MOUNTAIN, HILLS, SWAMP, SANDY, SNOWY, WASTELAND, BEACH, VOID] \n" +
                         "Use: [OVERWORLD] to generate in all biomes");
 
-
-        BUILDER.push("BASE");
-        ENABLE_MYSTICALAGRICULTURE_BASE = BUILDER
-                .define("Enabled:", true);
-
-        BUILDER.pop();
-
         BUILDER.push("ELEMENTS");
         ENABLE_MYSTICALAGRICULTURE_ELEMENTAL = BUILDER
+                .define("Enabled:", false);
+        BUILDER.push("WILD AIR");
+        AIR_ENABLED_MYSTICALAGRICULTURE = BUILDER
                 .define("Enabled:", true);
-
+        AIR_BIOME_TYPE_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default: [SAVANNA]")
+                .define("Biome Type:", "SAVANNA");
+        AIR_FREQUENCY_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default [1]")
+                .define("Frequency:", 1);
+        AIR_PATCH_SIZE_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default [1]")
+                .define("Patch Size:", 1);
+        BUILDER.pop();
+        BUILDER.push("WILD EARTH");
+        EARTH_ENABLED_MYSTICALAGRICULTURE = BUILDER
+                .define("Enabled:", true);
+        EARTH_BIOME_TYPE_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default: [SAVANNA]")
+                .define("Biome Type:", "SAVANNA");
+        EARTH_FREQUENCY_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default [1]")
+                .define("Frequency:", 1);
+        EARTH_PATCH_SIZE_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default [1]")
+                .define("Patch Size:", 1);
+        BUILDER.pop();
+        BUILDER.push("WILD WATER");
+        WATER_ENABLED_MYSTICALAGRICULTURE = BUILDER
+                .define("Enabled:", true);
+        WATER_BIOME_TYPE_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default: [SAVANNA]")
+                .define("Biome Type:", "SAVANNA");
+        WATER_FREQUENCY_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default [1]")
+                .define("Frequency:", 1);
+        WATER_PATCH_SIZE_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default [1]")
+                .define("Patch Size:", 1);
+        BUILDER.pop();
+        BUILDER.push("WILD FIRE");
+        FIRE_ENABLED_MYSTICALAGRICULTURE = BUILDER
+                .define("Enabled:", true);
+        FIRE_BIOME_TYPE_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default: [SAVANNA]")
+                .define("Biome Type:", "SAVANNA");
+        FIRE_FREQUENCY_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default [1]")
+                .define("Frequency:", 1);
+        FIRE_PATCH_SIZE_MYSTICALAGRICULTURE = BUILDER
+                .comment("Default [1]")
+                .define("Patch Size:", 1);
+        BUILDER.pop();
         BUILDER.pop();
 
         BUILDER.push("PASSIVE_MOBS");
         ENABLE_MYSTICALAGRICULTURE_MOB_PASSIVE = BUILDER
-                .define("Enabled:", true);
+                .define("Enabled:", false);
 
         BUILDER.pop();
 
         BUILDER.push("AGGRESSIVE_MOBS");
         ENABLE_MYSTICALAGRICULTURE_MOB = BUILDER
-                .define("Enabled:", true);
+                .define("Enabled:", false);
 
         BUILDER.pop();
 
         BUILDER.push("BLOCKS");
         ENABLE_MYSTICALAGRICULTURE_BLOCKS = BUILDER
-                .define("Enabled:", true);
+                .define("Enabled:", false);
 
         BUILDER.pop();
 
         BUILDER.push("RESOURCES");
         ENABLE_MYSTICALAGRICULTURE_RESOURCES = BUILDER
-                .define("Enabled:", true);
+                .define("Enabled:", false);
 
         BUILDER.pop();
 
         BUILDER.push("METALS");
         ENABLE_MYSTICALAGRICULTURE_METALS = BUILDER
-                .define("Enabled:", true);
+                .define("Enabled:", false);
 
         BUILDER.pop();
 
         BUILDER.push("OTHER");
         ENABLE_MYSTICALAGRICULTURE_OTHER = BUILDER
-                .define("Enabled:", true);
+                .define("Enabled:", false);
 
         BUILDER.pop();
 

diff --git a/src/main/java/wks/wolfkidsounds/wildplants/render/ModRenderers.java b/src/main/java/wks/wolfkidsounds/wildplants/render/ModRenderers.java
@@ -1,11 +1,18 @@
 package wks.wolfkidsounds.wildplants.render;
 
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.FlowerBlock;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.RenderTypeLookup;
+import net.minecraft.potion.Effects;
+import net.minecraftforge.fml.RegistryObject;
 import wks.wolfkidsounds.wildplants.block.ModBlocks;
 import wks.wolfkidsounds.wildplants.block.ModBlocks;
 import wks.wolfkidsounds.wildplants.block.ModBlocks;
 import wks.wolfkidsounds.wildplants.config.CompatConfig;
+import wks.wolfkidsounds.wildplants.config.features.mysticalagriculture.MysticalAgricultureConfig;
 
 public class ModRenderers {
 
@@ -114,9 +121,13 @@ public static void registerBlockCutout() {
 
         if (CompatConfig.LOADED_MYSTICALAGRICULTURE && CompatConfig.ENABLE_MYSTICALAGRICULTURE.get()) {
 
-        }
-
-        if (CompatConfig.LOADED_INDUSTRIALAGRICULTURE && CompatConfig.ENABLE_INDUSTRIALAGRICULTURE.get()) {
+            //ELEMENTAL
+            if (MysticalAgricultureConfig.ENABLE_MYSTICALAGRICULTURE_ELEMENTAL.get()) {
+                RenderTypeLookup.setRenderLayer(ModBlocks.MYSTICALAGRICULTURE_WILD_AIR_FLOWER.get(), RenderType.getCutout());
+                RenderTypeLookup.setRenderLayer(ModBlocks.MYSTICALAGRICULTURE_WILD_EARTH_FLOWER.get(), RenderType.getCutout());
+                RenderTypeLookup.setRenderLayer(ModBlocks.MYSTICALAGRICULTURE_WILD_WATER_FLOWER.get(), RenderType.getCutout());
+                RenderTypeLookup.setRenderLayer(ModBlocks.MYSTICALAGRICULTURE_WILD_FIRE_FLOWER.get(), RenderType.getCutout());
+            }
 
         }
     }

diff --git a/src/main/java/wks/wolfkidsounds/wildplants/utils/FileUtils.java b/src/main/java/wks/wolfkidsounds/wildplants/utils/FileUtils.java
@@ -13,9 +13,14 @@ public class FileUtils {
 
     public static void createFolders() {
         Path wildplantsConfigurationPath = Paths.get(FMLPaths.CONFIGDIR.get().toAbsolutePath().toString(), "wildplants");
+        Path wildplantsSettingsConfigurationPath = Paths.get(FMLPaths.CONFIGDIR.get().toAbsolutePath().toString(), "wildplants/features");
 
         try {Files.createDirectory(wildplantsConfigurationPath);}
         catch (FileAlreadyExistsException event) { Wildplants.LOGGER.debug("Configuration already exists. nice."); }//do nothing
         catch (IOException event) {Wildplants.LOGGER.error("The wildplants configuration directory could not be created", event);}
+
+        try {Files.createDirectory(wildplantsSettingsConfigurationPath);}
+        catch (FileAlreadyExistsException event) { Wildplants.LOGGER.debug("Settings Configuration already exists. nice."); }//do nothing
+        catch (IOException event) {Wildplants.LOGGER.error("The wildplants settings configuration directory could not be created", event);}
     }
 }
diff --git a/src/main/java/wks/wolfkidsounds/wildplants/world/ModWorldEvents.java b/src/main/java/wks/wolfkidsounds/wildplants/world/ModWorldEvents.java
@@ -1,17 +1,22 @@
 package wks.wolfkidsounds.wildplants.world;
 
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderTypeLookup;
 import net.minecraftforge.event.world.BiomeLoadingEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import wks.wolfkidsounds.wildplants.Wildplants;
+import wks.wolfkidsounds.wildplants.block.ModBlocks;
 import wks.wolfkidsounds.wildplants.config.CompatConfig;
 import wks.wolfkidsounds.wildplants.config.features.harvestcraft.HarvestcraftConfig;
 import wks.wolfkidsounds.wildplants.config.features.immersiveengineering.ImmersiveEngineeringConfig;
 import wks.wolfkidsounds.wildplants.config.features.minecraft.MinecraftConfig;
+import wks.wolfkidsounds.wildplants.config.features.mysticalagriculture.MysticalAgricultureConfig;
 import wks.wolfkidsounds.wildplants.config.features.veggieway.VeggiewayConfig;
 import wks.wolfkidsounds.wildplants.world.harvestcraft.HarvestcraftWildplantsGeneration;
 import wks.wolfkidsounds.wildplants.world.immersiveengineering.ImmersiveEngineeringWildplantsGeneration;
 import wks.wolfkidsounds.wildplants.world.minecraft.MinecraftWildplantsGeneration;
+import wks.wolfkidsounds.wildplants.world.mysticalagriculture.MysticalAgricultureWildplantsGeneration;
 import wks.wolfkidsounds.wildplants.world.veggieway.VeggiewayWildplantsGeneration;
 
 
@@ -114,18 +119,31 @@ public static void biomeLoadingEvent(final BiomeLoadingEvent event) {
         }
 
         if (CompatConfig.LOADED_VEGGIEWAY && CompatConfig.ENABLE_VEGGIEWAY.get()) {
-            if (VeggiewayConfig.CORN_ENABLED_VEGGIEWAY.get()) { VeggiewayWildplantsGeneration.generateWildCorn(event); }
-            if (VeggiewayConfig.LENTIL_ENABLED_VEGGIEWAY.get()) { VeggiewayWildplantsGeneration.generateWildLentil(event); }
-            if (VeggiewayConfig.QUINOA_ENABLED_VEGGIEWAY.get()) { VeggiewayWildplantsGeneration.generateWildQuinoa(event); }
-            if (VeggiewayConfig.SOYBEAN_ENABLED_VEGGIEWAY.get()) { VeggiewayWildplantsGeneration.generateWildSoybean(event); }
+            if (VeggiewayConfig.CORN_ENABLED_VEGGIEWAY.get()) {VeggiewayWildplantsGeneration.generateWildCorn(event);}
+            if (VeggiewayConfig.LENTIL_ENABLED_VEGGIEWAY.get()) {VeggiewayWildplantsGeneration.generateWildLentil(event);}
+            if (VeggiewayConfig.QUINOA_ENABLED_VEGGIEWAY.get()) {VeggiewayWildplantsGeneration.generateWildQuinoa(event);}
+            if (VeggiewayConfig.SOYBEAN_ENABLED_VEGGIEWAY.get()) {VeggiewayWildplantsGeneration.generateWildSoybean(event);}
         }
 
-        if (CompatConfig.LOADED_MYSTICALAGRICULTURE && CompatConfig.ENABLE_MYSTICALAGRICULTURE.get()) {
+        //ELEMENTAL
+        /*
+        if (CompatConfig.LOADED_MYSTICALAGRICULTURE && CompatConfig.ENABLE_MYSTICALAGRICULTURE.get() && MysticalAgricultureConfig.ENABLE_MYSTICALAGRICULTURE_ELEMENTAL.get()) {
+            if (MysticalAgricultureConfig.AIR_ENABLED_MYSTICALAGRICULTURE.get()) {
+                MysticalAgricultureWildplantsGeneration.generateWildAir(event);
+            }
 
-        }
+            if (MysticalAgricultureConfig.EARTH_ENABLED_MYSTICALAGRICULTURE.get()) {
+                MysticalAgricultureWildplantsGeneration.generateWildEarth(event);
+            }
 
-        if (CompatConfig.LOADED_INDUSTRIALAGRICULTURE && CompatConfig.ENABLE_INDUSTRIALAGRICULTURE.get()) {
+            if (MysticalAgricultureConfig.WATER_ENABLED_MYSTICALAGRICULTURE.get()) {
+                MysticalAgricultureWildplantsGeneration.generateWildWater(event);
+            }
 
+            if (MysticalAgricultureConfig.FIRE_ENABLED_MYSTICALAGRICULTURE.get()) {
+                MysticalAgricultureWildplantsGeneration.generateWildFire(event);
+            }
         }
+         */
     }
 }
diff --git a/...kidsounds/wildplants/world/mysticalagriculture/MysticalAgricultureConfiguredFeatures.java b/...kidsounds/wildplants/world/mysticalagriculture/MysticalAgricultureConfiguredFeatures.java
@@ -0,0 +1,17 @@
+package wks.wolfkidsounds.wildplants.world.mysticalagriculture;
+
+import wks.wolfkidsounds.wildplants.config.WildplantsConfig;
+
+public class MysticalAgricultureConfiguredFeatures {
+    public static Integer FREQUENCY_GLOBAL = WildplantsConfig.GLOBAL_FREQUENCY.get();
+    public static Integer PATCH_SIZE_GLOBAL = WildplantsConfig.GLOBAL_PATCH_SIZE.get();
+    public static Integer SPREAD_SIZE = WildplantsConfig.GLOBAL_SPREAD_SIZE.get();
+
+
+    //----------FEATURE---CONFIGS----------------
+
+
+    //----------PLACEMENT---CONFIGS----------------
+
+
+}
diff --git a/...dsounds/wildplants/world/mysticalagriculture/MysticalAgricultureWildplantsGeneration.java b/...dsounds/wildplants/world/mysticalagriculture/MysticalAgricultureWildplantsGeneration.java
@@ -0,0 +1,5 @@
+package wks.wolfkidsounds.wildplants.world.mysticalagriculture;
+
+public class MysticalAgricultureWildplantsGeneration {
+
+}
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -4,7 +4,7 @@ license="GNU General Public License version 3 (GPLv3)"
 
 [[mods]]
 modId="wildplants"
-version="1.16.5_2.4.1_forge"
+version="1.16.5_2.4.2_forge"
 displayName="Wildplants"
 credits="WOLFKIDSOUNDS"
 displayURL="https://wolfkidsounds.com"

diff --git a/src/main/resources/assets/wildplants/blockstates/harvestcraft_wild_agave.json b/src/main/resources/assets/wildplants/blockstates/harvestcraft_wild_agave.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "": {
-      "model": "wildplants:block/harvestcraft_wild_agave"
+      "model": "pamhc2crops:block/agave_stage_3"
     }
   }
 }
diff --git a/src/main/resources/assets/wildplants/blockstates/harvestcraft_wild_amaranth.json b/src/main/resources/assets/wildplants/blockstates/harvestcraft_wild_amaranth.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "": {
-      "model": "wildplants:block/harvestcraft_wild_amaranth"
+      "model": "pamhc2crops:block/amaranth_stage_3"
     }
   }
 }
diff --git a/src/main/resources/assets/wildplants/blockstates/harvestcraft_wild_arrowroot.json b/src/main/resources/assets/wildplants/blockstates/harvestcraft_wild_arrowroot.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "": {
-      "model": "wildplants:block/harvestcraft_wild_arrowroot"
+      "model": "pamhc2crops:block/arrowroot_stage_3"
     }
   }
 }
diff --git a/src/main/resources/assets/wildplants/blockstates/harvestcraft_wild_artichoke.json b/src/main/resources/assets/wildplants/blockstates/harvestcraft_wild_artichoke.json
@@ -1,7 +1,7 @@
 {
   "variants": {
     "": {
-      "model": "wildplants:block/harvestcraft_wild_artichoke"
+      "model": "pamhc2crops:block/artichoke_stage_3"
     }
   }
 }