Skip to content

Commit

Permalink
1.17.1_2.1.6
Browse files Browse the repository at this point in the history
- removed unused stuff and cleaned up
  • Loading branch information
wolfkidsounds committed Jan 28, 2022
1 parent 7f0c060 commit 4cfb05b
Show file tree
Hide file tree
Showing 334 changed files with 40 additions and 8,283 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.parchmentmc.librarian.forgegradle'

group = 'wks.wolfkidsounds'
version = '1.17.1_forge_2.1.4'
version = '1.17.1_2.1.6_forge'

java {
archivesBaseName = 'wildplants'
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/wks/wolfkidsounds/wildplants/Wildplants.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
Expand All @@ -16,6 +15,7 @@
import wks.wolfkidsounds.wildplants.block.ModBlocks;
import wks.wolfkidsounds.wildplants.config.WildplantsConfig;
import wks.wolfkidsounds.wildplants.config.features.WildplantsFeaturesConfig;
import wks.wolfkidsounds.wildplants.utils.FileUtils;
import wks.wolfkidsounds.wildplants.items.ModItems;
import wks.wolfkidsounds.wildplants.render.ModRenderers;

Expand All @@ -35,11 +35,10 @@ public ItemStack makeIcon() {
public Wildplants() {
IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();

ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON,
WildplantsConfig.SPEC, "./wildplants/wildplants-common.toml");
FileUtils.createFolders();

ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON,
WildplantsFeaturesConfig.SPEC, "./wildplants/wildplants-features-common.toml");
ModLoadingContext.get().registerConfig(net.minecraftforge.fml.config.ModConfig.Type.COMMON, WildplantsConfig.SPEC, "wildplants/wildplants-common.toml");
ModLoadingContext.get().registerConfig(net.minecraftforge.fml.config.ModConfig.Type.CLIENT, WildplantsFeaturesConfig.SPEC, "wildplants/settings-common.toml");

ModBlocks.register(eventBus);
ModItems.register(eventBus);
Expand Down
249 changes: 7 additions & 242 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
@@ -1,34 +1,15 @@
package wks.wolfkidsounds.wildplants.config;

import net.minecraftforge.common.ForgeConfigSpec;
import net.minecraftforge.fml.ModList;
import wks.wolfkidsounds.wildplants.Wildplants;

public class CompatConfig {
//COMPAT
public static ForgeConfigSpec.BooleanValue ENABLE_MINECRAFT;

public static ForgeConfigSpec.BooleanValue ENABLE_IMMERSIVEENGINEERING;
public static ForgeConfigSpec.BooleanValue ENABLE_HARVESTCRAFT;

public static Boolean LOADED_IMMERSIVEENGINEERING = ModList.get().isLoaded("immersiveengineering");
public static Boolean LOADED_HARVESTCRAFT = ModList.get().isLoaded("pamhc2crops");

public static void initMinecraft(ForgeConfigSpec.Builder BUILDER) {
Wildplants.LOGGER.debug("init-compat-minecraft-configuration");
ENABLE_MINECRAFT = BUILDER
.define("Minecraft", true);
}

public static void initImmersiveEngineering(ForgeConfigSpec.Builder BUILDER) {
Wildplants.LOGGER.debug("init-compat-immersiveengineering-configuration");
ENABLE_IMMERSIVEENGINEERING = BUILDER
.define("Immersive_Engineering", true);
}

public static void initHarvestcraft(ForgeConfigSpec.Builder BUILDER) {
Wildplants.LOGGER.debug("init-compat-harvestcraft-configuration");
ENABLE_HARVESTCRAFT = BUILDER
.define("Pams_Harvestcraft", true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public final class WildplantsConfig {
BUILDER.comment("A config file will be generated when the mod is loaded while the feature is enabled. \n" +
"If you disable a feature the config file and block registration/generation will be disabled");
CompatConfig.initMinecraft(BUILDER);
CompatConfig.initImmersiveEngineering(BUILDER);
CompatConfig.initHarvestcraft(BUILDER);
//CompatConfig.initImmersiveEngineering(BUILDER);
//CompatConfig.initHarvestcraft(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
Expand Up @@ -28,17 +28,6 @@ public final class WildplantsFeaturesConfig {
BUILDER.pop();
}

if (CompatConfig.LOADED_IMMERSIVEENGINEERING && CompatConfig.ENABLE_IMMERSIVEENGINEERING.get()) {
BUILDER.push("Immersive_Engineering");
ImmersiveEngineeringConfig.init(BUILDER);
BUILDER.pop();
}

if (CompatConfig.LOADED_HARVESTCRAFT && CompatConfig.ENABLE_HARVESTCRAFT.get()) {
BUILDER.push("Harvestcraft");
HarvestcraftConfig.init(BUILDER);
BUILDER.pop();
}
SPEC = BUILDER.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
public class ModRenderers {

public ModRenderers() {

}

public static void registerBlockCutout() {
Expand All @@ -17,93 +18,5 @@ public static void registerBlockCutout() {
ItemBlockRenderTypes.setRenderLayer(ModBlocks.MINECRAFT_WILD_POTATOES.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.MINECRAFT_WILD_BEETROOTS.get(), RenderType.cutout());
}

if (CompatConfig.LOADED_IMMERSIVEENGINEERING && CompatConfig.ENABLE_IMMERSIVEENGINEERING.get()) {
ItemBlockRenderTypes.setRenderLayer(ModBlocks.IMMERSIVEENGINEERING_WILD_HEMP.get(), RenderType.cutout());
}

if (CompatConfig.LOADED_HARVESTCRAFT && CompatConfig.ENABLE_HARVESTCRAFT.get()) {
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_AGAVE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_AMARANTH.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_ARROWROOT.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_ARTICHOKE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_ASPARAGUS.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_BARLEY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_BEAN.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_BELLPEPPER.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_BLACKBERRY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_BLUEBERRY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_BROCCOLI.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_BRUSSELSPROUT.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CABBAGE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CACTUSFRUIT.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CANDLEBERRY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CANTALOUPE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CASSAVA.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CAULIFLOWER.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CELERY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CHICKPEA.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CHILIPEPPER.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_COFFEEBEAN.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CORN.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_COTTON.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CRANBERRY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_CUCUMBER.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_EGGPLANT.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_ELDERBERRY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_FLAX.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_GARLIC.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_GINGER.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_GRAPE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_GREENGRAPE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_HUCKLEBERRY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_JICAMA.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_JUNIPERBERRY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_JUTE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_KALE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_KENAF.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_KIWI.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_KOHLRABI.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_LEEK.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_LENTIL.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_LETTUCE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_MILLET.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_MULBERRY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_MUSTARDSEEDS.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_OATS.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_OKRA.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_ONION.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_PARSNIP.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_PEANUT.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_PEAS.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_PINEAPPLE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_QUINOA.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_RADISH.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_RASPBERRY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_RHUBARB.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_RICE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_RUTABAGA.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_RYE.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_SCALLION.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_SESAMESEEDS.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_SISAL.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_SOYBEAN.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_SPINACH.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_SPICELEAF.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_STRAWBERRY.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_SWEETPOTATO.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_TARO.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_TEALEAF.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_TOMATILLO.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_TOMATO.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_TURNIP.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_WATERCHESTNUT.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_WHITEMUSHROOM.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_WINTERSQUASH.get(), RenderType.cutout());
ItemBlockRenderTypes.setRenderLayer(ModBlocks.HARVESTCRAFT_WILD_ZUCCHINI.get(), RenderType.cutout());
}
}



}
}
21 changes: 21 additions & 0 deletions src/main/java/wks/wolfkidsounds/wildplants/utils/FileUtils.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package wks.wolfkidsounds.wildplants.utils;

import net.minecraftforge.fml.loading.FMLPaths;
import wks.wolfkidsounds.wildplants.Wildplants;

import java.io.IOException;
import java.nio.file.FileAlreadyExistsException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;

public class FileUtils {

public static void createFolders() {
Path wildplantsConfigurationPath = Paths.get(FMLPaths.CONFIGDIR.get().toAbsolutePath().toString(), "wildplants");

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);}
}
}
Loading

0 comments on commit 4cfb05b

Please sign in to comment.