Skip to content

Commit

Permalink
Move GT5u related pollution mixin to GT5u (#431)
Browse files Browse the repository at this point in the history
* remove questionable method in TileEntityRendererDispatcherMixin

* move to GT5u the mixin to change the hazmat suit check in IC2

* move to GT5u the mixins for rendering pollution effects
  • Loading branch information
Alexdoru authored Oct 21, 2024
1 parent 3b3a76e commit c702240
Show file tree
Hide file tree
Showing 27 changed files with 5 additions and 1,046 deletions.
6 changes: 0 additions & 6 deletions src/main/java/com/mitchej123/hodgepodge/Common.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package com.mitchej123.hodgepodge;

import java.io.File;

import net.minecraft.launchwrapper.Launch;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
Expand All @@ -15,13 +11,11 @@ public class Common {

public static final Logger log = LogManager.getLogger("Hodgepodge");
public static final Marker securityMarker = MarkerManager.getMarker("SuspiciousPackets");
public static LoadingConfig config;
public static boolean thermosTainted;
public static XSTR RNG = new XSTR();

static {
Common.log.info("Initializing Hodgepodge");
Common.config = new LoadingConfig(new File(Launch.minecraftHome, "config/hodgepodge.cfg"));
Common.log.info("Looking for Thermos/Bukkit taint.");
try {
Class.forName("org.bukkit.World");
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/mitchej123/hodgepodge/Hodgepodge.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ public String call() {
public void preinit(FMLPreInitializationEvent event) {
Compat.init(event.getSide());
EVENT_HANDLER.preinit();

if (event.getSide() == Side.CLIENT) {
HodgepodgeClient.preInit();
}
}

@EventHandler
Expand Down
61 changes: 0 additions & 61 deletions src/main/java/com/mitchej123/hodgepodge/LoadingConfig.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ public class HodgepodgeClient {
public static final ManagedEnum<AnimationMode> animationsMode = new ManagedEnum<>(AnimationMode.VISIBLE_ONLY);
public static final ManagedEnum<RenderDebugMode> renderDebugMode = new ManagedEnum<>(RenderDebugMode.REDUCED);

public static void preInit() {
if (Compat.isGT5Present()) {
MinecraftForge.EVENT_BUS.register(PollutionTooltip.INSTANCE);
}
}

public static void postInit() {

if (DebugConfig.renderDebug) {
Expand All @@ -47,15 +41,6 @@ public static void postInit() {
}
}

if (Compat.isGT5Present()) {
Common.config.postInitClient();
MinecraftForge.EVENT_BUS.register(Common.config.standardBlocks);
MinecraftForge.EVENT_BUS.register(Common.config.liquidBlocks);
MinecraftForge.EVENT_BUS.register(Common.config.doublePlants);
MinecraftForge.EVENT_BUS.register(Common.config.crossedSquares);
MinecraftForge.EVENT_BUS.register(Common.config.blockVine);
}

FMLCommonHandler.instance().bus().register(ClientTicker.INSTANCE);
ClientRegistry.registerKeyBinding(ClientKeyListener.FastBlockPlacingKey);

Expand Down
114 changes: 0 additions & 114 deletions src/main/java/com/mitchej123/hodgepodge/client/PollutionTooltip.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,6 @@ public class FixesConfig {
@Config.DefaultBoolean(true)
public static boolean fixIc2DirectInventoryAccess;

@Config.Comment("Fix IC2 armors to avoid giving poison")
@Config.DefaultBoolean(true)
public static boolean fixIc2Hazmat;

@Config.Comment("Fix IC2's armor hover mode")
@Config.DefaultBoolean(true)
public static boolean fixIc2HoverMode;
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
import com.mitchej123.hodgepodge.config.DebugConfig;
import com.mitchej123.hodgepodge.config.FixesConfig;
import com.mitchej123.hodgepodge.config.GeneralConfig;
import com.mitchej123.hodgepodge.config.PollutionConfig;
import com.mitchej123.hodgepodge.config.PollutionRecolorConfig;
import com.mitchej123.hodgepodge.config.SpeedupsConfig;
import com.mitchej123.hodgepodge.config.TweaksConfig;

Expand All @@ -25,8 +23,6 @@ public HodgepodgeGuiConfig(GuiScreen parent) throws ConfigException {
DebugConfig.class,
FixesConfig.class,
GeneralConfig.class,
PollutionConfig.class,
PollutionRecolorConfig.class,
SpeedupsConfig.class,
TweaksConfig.class);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
import com.mitchej123.hodgepodge.config.DebugConfig;
import com.mitchej123.hodgepodge.config.FixesConfig;
import com.mitchej123.hodgepodge.config.GeneralConfig;
import com.mitchej123.hodgepodge.config.PollutionConfig;
import com.mitchej123.hodgepodge.config.PollutionRecolorConfig;
import com.mitchej123.hodgepodge.config.SpeedupsConfig;
import com.mitchej123.hodgepodge.config.TweaksConfig;
import com.mitchej123.hodgepodge.mixins.Mixins;
Expand All @@ -33,8 +31,6 @@ public class HodgepodgeCore implements IFMLLoadingPlugin, IEarlyMixinLoader {
ConfigurationManager.registerConfig(DebugConfig.class);
ConfigurationManager.registerConfig(FixesConfig.class);
ConfigurationManager.registerConfig(GeneralConfig.class);
ConfigurationManager.registerConfig(PollutionConfig.class);
ConfigurationManager.registerConfig(PollutionRecolorConfig.class);
ConfigurationManager.registerConfig(SpeedupsConfig.class);
ConfigurationManager.registerConfig(TweaksConfig.class);
} catch (ConfigException e) {
Expand Down
Loading

0 comments on commit c702240

Please sign in to comment.