Skip to content

Commit

Permalink
Add MixinBasic (Mythical Creatures) + Remove MixinEntityTrackerEntry
Browse files Browse the repository at this point in the history
  • Loading branch information
quentin452 committed Jan 29, 2024
1 parent 3123652 commit fb0aa28
Show file tree
Hide file tree
Showing 6 changed files with 1,448 additions and 256 deletions.
1 change: 1 addition & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ dependencies {
implementation "curse.maven:zombie-awareness-237754:2285743-deobf-sources-api"
implementation "curse.maven:automagy-222153:2285272-deobf-sources-api"
implementation "curse.maven:tumbleweed-245028:2299772-deobf-sources-api"
implementation "curse.maven:mlp-mythical-creatures-updated-to-1-7-10-226048:2277522-deobf-sources-api"

runtimeOnly('com.github.GTNewHorizons:BuildCraft:7.1.36:dev')
transformedMod('com.github.GTNewHorizons:TinkersConstruct:1.10.11-GTNH:dev')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ public enum Mixin implements IMixin {
common_buildcraft_MixinBlockBuildCraftFluid(Side.COMMON,
require(TargetedMod.BUILDCRAFT).and(m -> OptimizationsandTweaksConfig.enableMixinBlockBuildCraftFluid),
"buildcraft.MixinBlockBuildCraftFluid"),

common_mythicalcreatures_MixinBasic(Side.COMMON,
require(TargetedMod.MYTICALCREATURES).and(require(TargetedMod.CONFIGHELPER).and(m -> OptimizationsandTweaksConfig.enableMixinBasic)),
"mythicalcreatures.MixinBasic"),
common_sgstreasure_MixinObsidianChestGenerator(Side.COMMON,
require(TargetedMod.SGSTREASURE).and(m -> OptimizationsandTweaksConfig.enableMixinObsidianChestGenerator),
"sgstreasure.MixinObsidianChestGenerator"),
Expand Down Expand Up @@ -198,8 +200,6 @@ public enum Mixin implements IMixin {
common_core_MixinModifiableAttributeInstance(Side.COMMON,
m -> OptimizationsandTweaksConfig.enableMixinModifiableAttributeInstance,
"core.MixinModifiableAttributeInstance"),
common_core_MixinEntityTrackerEntry(Side.COMMON, m -> OptimizationsandTweaksConfig.enableMixinEntityTrackerEntry,
"core.MixinEntityTrackerEntry"),

common_core_MixinEntityTracker(Side.COMMON, m -> OptimizationsandTweaksConfig.enableMixinEntityTracker,
"core.MixinEntityTracker"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public enum TargetedMod implements ITargetedMod {
ALFHEIM("Alfheim", false, startsWith("Alfheim")),
AUTOMAGY("Automagy", false, startsWith("Automagy")),
TUMBLEWEED("tumbleweed", false, startsWith("tumbleweed")),

MYTICALCREATURES("MythicalC", false, startsWith("MythicalC")),
APPLIEDENERGISTICS("appliedenergistics2", false, startsWith("appliedenergistics2")),
AETHER("aether", false, startsWith("aether")),;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ public class OptimizationsandTweaksConfig {
@Config.DefaultBoolean(true)
@Config.RequiresWorldRestart
public static boolean enableMixinIntCache;
@Config.Comment("Optimize EntityTrackerEntry Class.")
@Config.DefaultBoolean(true)
@Config.RequiresWorldRestart
public static boolean enableMixinEntityTrackerEntry;

@Config.Comment("Optimize EntityTracker Class.")
@Config.DefaultBoolean(true)
Expand Down Expand Up @@ -196,6 +192,10 @@ public class OptimizationsandTweaksConfig {
@Config.DefaultBoolean(true)
@Config.RequiresWorldRestart
public static boolean enableMixinEntityItem;
@Config.Comment("Tweak Init for Basic class from Mythical Creatures")
@Config.DefaultBoolean(true)
@Config.RequiresWorldRestart
public static boolean enableMixinBasic;
@Config.Comment("Tweak BlockBuildCraftFluid class from Buildcraft")
@Config.DefaultBoolean(true)
@Config.RequiresWorldRestart
Expand Down Expand Up @@ -463,7 +463,6 @@ public class OptimizationsandTweaksConfig {
@Config.DefaultBoolean(true)
@Config.RequiresWorldRestart
public static boolean enableMixinSaveHandler;

@Config.Comment("Optimize BlockFLuid Class")
@Config.DefaultBoolean(true)
@Config.RequiresWorldRestart
Expand Down

This file was deleted.

Loading

0 comments on commit fb0aa28

Please sign in to comment.