Skip to content

Commit

Permalink
1.16.5_2.4.3
Browse files Browse the repository at this point in the history
- removed mysticalagriculture stuff (will not be added in the 1.16.5 version
- made some error texts more clear
- fixed an issue where the patch size of "harvestcraft:artichoke" was not working correctly
- updated "harvestcraft" to follow the new generation rules
- debug mode is now disabled by default
  • Loading branch information
wolfkidsounds committed Feb 20, 2022
1 parent 572f796 commit f6ed323
Show file tree
Hide file tree
Showing 15 changed files with 863 additions and 1,063 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle'

group = 'wks.wolfkidsounds'
version = '1.16.5_2.4.2_forge_snap'
version = '1.16.5_2.4.3_forge_snap'

java {
archivesBaseName = 'wildplants'
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/wks/wolfkidsounds/wildplants/Wildplants.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
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;
import wks.wolfkidsounds.wildplants.utils.FileUtils;

import java.util.Date;

// The value here should match an entry in the META-INF/mods.toml file
@Mod("wildplants")
public class Wildplants {
Expand All @@ -45,7 +46,6 @@ 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);
Expand Down
255 changes: 0 additions & 255 deletions src/main/java/wks/wolfkidsounds/wildplants/block/ModBlocks.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import wks.wolfkidsounds.wildplants.Wildplants;

public class CompatConfig {

//COMPAT
public static ForgeConfigSpec.BooleanValue ENABLE_MINECRAFT;

Expand All @@ -18,8 +17,6 @@ public class CompatConfig {
public static Boolean LOADED_IMMERSIVEENGINEERING = ModList.get().isLoaded("immersiveengineering");
public static Boolean LOADED_HARVESTCRAFT = ModList.get().isLoaded("pamhc2crops");
public static Boolean LOADED_VEGGIEWAY = ModList.get().isLoaded("veggie_way");
public static Boolean LOADED_MYSTICALAGRICULTURE = ModList.get().isLoaded("mysticalagriculture");
public static Boolean LOADED_INDUSTRIALAGRICULTURE = ModList.get().isLoaded("industrialagriculture");

public static void initMinecraft(ForgeConfigSpec.Builder BUILDER) {
Wildplants.LOGGER.debug("init-compat-minecraft-configuration");
Expand All @@ -44,16 +41,4 @@ public static void initVeggieway(ForgeConfigSpec.Builder BUILDER) {
ENABLE_VEGGIEWAY = BUILDER
.define("Veggie_Way", true);
}

public static void initMysticalAgriculture(ForgeConfigSpec.Builder BUILDER) {
Wildplants.LOGGER.debug("init-compat-mysticalagriculture-configuration");
ENABLE_MYSTICALAGRICULTURE = BUILDER
.define("Mystical_Agriculture", true);
}

public static void initIndustrialAgriculture(ForgeConfigSpec.Builder BUILDER) {
Wildplants.LOGGER.debug("init-compat-industrialagriculture-configuration");
ENABLE_INDUSTRIALAGRICULTURE = BUILDER
.define("Industrial_Agriculture", true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public final class WildplantsConfig {
Wildplants.LOGGER.debug("init-configuration");

BUILDER.push("General");
DEBUG = BUILDER.define("DEBUG", true);
DEBUG = BUILDER.define("DEBUG", false);
BUILDER.push("Global_Modifier");
//GLOBAL_CHANCE = BUILDER.comment("Global rarity modifier (higher is less) [Default: 10]").define("Rarity", 10);
GLOBAL_FREQUENCY = BUILDER
Expand All @@ -38,8 +38,6 @@ public final class WildplantsConfig {
CompatConfig.initImmersiveEngineering(BUILDER);
CompatConfig.initHarvestcraft(BUILDER);
CompatConfig.initVeggieway(BUILDER);
CompatConfig.initMysticalAgriculture(BUILDER);
CompatConfig.initIndustrialAgriculture(BUILDER);
BUILDER.pop();
BUILDER.pop();

Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
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 {

Expand Down Expand Up @@ -118,18 +109,6 @@ public static void registerBlockCutout() {
RenderTypeLookup.setRenderLayer(ModBlocks.VEGGIEWAY_WILD_QUINOA.get(), RenderType.getCutout());
RenderTypeLookup.setRenderLayer(ModBlocks.VEGGIEWAY_WILD_SOYBEAN.get(), RenderType.getCutout());
}

if (CompatConfig.LOADED_MYSTICALAGRICULTURE && CompatConfig.ENABLE_MYSTICALAGRICULTURE.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());
}

}
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ public static void createFolders() {
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 (FileAlreadyExistsException event) { Wildplants.LOGGER.debug("Configuration directory 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 (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);}
}
}
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
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;


Expand Down Expand Up @@ -124,26 +119,5 @@ public static void biomeLoadingEvent(final BiomeLoadingEvent event) {
if (VeggiewayConfig.QUINOA_ENABLED_VEGGIEWAY.get()) {VeggiewayWildplantsGeneration.generateWildQuinoa(event);}
if (VeggiewayConfig.SOYBEAN_ENABLED_VEGGIEWAY.get()) {VeggiewayWildplantsGeneration.generateWildSoybean(event);}
}

//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 (MysticalAgricultureConfig.WATER_ENABLED_MYSTICALAGRICULTURE.get()) {
MysticalAgricultureWildplantsGeneration.generateWildWater(event);
}
if (MysticalAgricultureConfig.FIRE_ENABLED_MYSTICALAGRICULTURE.get()) {
MysticalAgricultureWildplantsGeneration.generateWildFire(event);
}
}
*/
}
}
Loading

0 comments on commit f6ed323

Please sign in to comment.