Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move GT5u related pollution mixin to GT5u #431

Merged
merged 4 commits into from
Oct 21, 2024
Merged

Move GT5u related pollution mixin to GT5u #431

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd513b5
remove questionable method in TileEntityRendererDispatcherMixin
Alexdoru Oct 19, 2024
beda348
move to GT5u the mixin to change the hazmat suit check in IC2
Alexdoru Oct 19, 2024
dde5d11
move to GT5u the mixins for rendering pollution effects
Alexdoru Oct 20, 2024
95b0269
Merge branch 'master' into pollution
Alexdoru Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/main/java/com/mitchej123/hodgepodge/Common.java
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/main/java/com/mitchej123/hodgepodge/client/HodgepodgeClient.java
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/java/com/mitchej123/hodgepodge/config/FixesConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,11 +531,6 @@ public class FixesConfig {
@Config.RequiresMcRestart
public static boolean fixIc2DirectInventoryAccess;

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

@Config.Comment("Fix IC2's armor hover mode")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
Expand Down
61 changes: 0 additions & 61 deletions src/main/java/com/mitchej123/hodgepodge/config/PollutionConfig.java
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions src/main/java/com/mitchej123/hodgepodge/config/PollutionRecolorConfig.java
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/main/java/com/mitchej123/hodgepodge/config/gui/HodgepdgeGuiConfig.java
View file
Open in desktop
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 @@ -24,8 +22,6 @@ public HodgepdgeGuiConfig(GuiScreen parent) throws ConfigException {
DebugConfig.class,
FixesConfig.class,
GeneralConfig.class,
PollutionConfig.class,
PollutionRecolorConfig.class,
SpeedupsConfig.class,
TweaksConfig.class);
}
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/mitchej123/hodgepodge/core/HodgepodgeCore.java
View file
Open in desktop
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