Skip to content

Commit

Permalink
1.0.4: Remove Config + Remove TOP Fixes
Browse files Browse the repository at this point in the history
TOP fixes will be implemented a different way into base SD Drawers.
  • Loading branch information
IntegerLimit committed May 1, 2023
1 parent 00ef6e9 commit 203ab69
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 117 deletions.
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ It adds drawers for rubber and treated wood types found in [GTCEu](https://www.c

This mod requires GTCEu 2.6+, Storage Drawers, and their dependencies (Chameleon & CodeChickenLib)

This mod is a fork of JOB10's [Storage Drawers Kappa Addon](https://www.curseforge.com/minecraft/mc-mods/storagedrawerskappa), and uses its main code. This removes all of the integrations there, and replaces it with GT integration. The code there is very flexible, and can be used to create other drawer types. Go there for more information.
This mod is a fork of JOB10's [Storage Drawers Kappa Addon](https://www.curseforge.com/minecraft/mc-mods/storagedrawerskappa), and uses its main code. This removes all the integrations there, and replaces it with GT integration. The code there is very flexible, and can be used to create other drawer types. Go there for more information.

Please note that JOB10's repo is itself a fork of Raptor's [Storage Drawers Unlimited](https://www.curseforge.com/minecraft/mc-mods/storage-drawers-unlimited). We have used JOB10's fork, as it has some fixes over the original mod. Both mods are amazing.

Expand All @@ -16,4 +16,9 @@ Please note that JOB10's repo is itself a fork of Raptor's [Storage Drawers Unli

#### Added Drawers / Trims
* Rubber Wood
* Treated Wood
* Treated Wood

#### Removed All Config (No longer needed for GT Drawers)

#### New Buildscript

1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ dependencies {
}
deobfCompile "curse.maven:storage-drawers-223852:2952606"
deobfCompile "curse.maven:chameleon-230497:2450900"
deobfCompile "curse.maven:the-one-probe-245211:2667280"
}

sourceSets {
Expand Down
14 changes: 0 additions & 14 deletions src/main/java/io/github/nomiceu/GTDConfig.java

This file was deleted.

14 changes: 0 additions & 14 deletions src/main/java/io/github/nomiceu/GTDrawers.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package io.github.nomiceu;

import java.io.File;

import io.github.nomiceu.integration.TOP.TOPCompat;
import net.minecraftforge.fml.common.Loader;
import org.apache.logging.log4j.Logger;

import io.github.nomiceu.proxy.CommonProxy;
Expand Down Expand Up @@ -37,25 +33,15 @@ public class GTDrawers {
public static CommonProxy proxy;

public static Logger logger;

public static File configFolder;

@EventHandler
public void preInit(FMLPreInitializationEvent event) {
logger = event.getModLog();
configFolder = new File(event.getModConfigurationDirectory(), "gregtechdrawers");
if(!configFolder.isDirectory())
configFolder.mkdirs();
proxy.preInit(event);
}

@EventHandler
public void init(FMLInitializationEvent event) {
proxy.init(event);
if (Loader.isModLoaded("theoneprobe")) {
logger.info("Detected The One Probe. Enabling custom handlers.");
TOPCompat.registerProviders();
}
}

@EventHandler
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/io/github/nomiceu/integration/TOP/TOPCompat.java

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions src/main/java/io/github/nomiceu/type/Mods.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package io.github.nomiceu.type;

import java.io.File;
import java.io.FileNotFoundException;
import java.util.Map;
import java.util.Scanner;
import java.util.stream.Collectors;

import io.github.nomiceu.GTDrawers;
import io.github.nomiceu.block.BlockGTDrawers;
import io.github.nomiceu.block.BlockGTTrim;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.Level;

import io.github.nomiceu.item.ItemGTDrawers;
import io.github.nomiceu.item.ItemGTTrim;
Expand Down Expand Up @@ -625,15 +621,6 @@ public class Mods {
}
}

// load user-defined mods
for(File modList : GTDrawers.configFolder.listFiles(file -> file.isFile() && StringUtils.endsWithIgnoreCase(file.getName(), ".sdmods"))) {
try(Scanner scan = new Scanner(modList)) {
ModListParser.parseModList(modList.getName(), scan);
} catch(ModListParser.ModListSyntaxException | FileNotFoundException e) {
GTDrawers.logger.log(Level.ERROR, e);
}
}

MODS = StreamableFilterableIterable.wrap(Mod.internal_modlist);
ENABLED_MODS = MODS.filter(Mod::isEnabled);
BY_ID = MODS.stream()
Expand Down

0 comments on commit 203ab69

Please sign in to comment.