Skip to content

Commit

Permalink
Delete ASM (#91)
Browse files Browse the repository at this point in the history
* delete broken ASM code that never did anything in the full pack and that crashes the game anyways when you enable it

* spotless

* update

* Do not depend on itself

---------

Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Raven Szewczyk <[email protected]>
  • Loading branch information
3 people authored Sep 1, 2024
1 parent d04e074 commit 326e02a
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 316 deletions.
10 changes: 6 additions & 4 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
dependencies {
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.113:dev')
implementation('com.github.GTNewHorizons:TinkersConstruct:1.12.5-GTNH:dev')
implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.19-GTNH:dev')
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.35:dev') {
exclude group: "com.github.GTNewHorizons", module: "Galacticraft"
}
implementation('com.github.GTNewHorizons:TinkersConstruct:1.12.8-GTNH:dev')
implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.26-GTNH:dev')
api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-418-GTNH:api')
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-442-GTNH:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
compileOnly('curse.maven:cofh-lib-220333:2388748')
compileOnly('curse.maven:PlayerAPI-228969:2248928')
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.25'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26'
}


Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package micdoodle8.mods.galacticraft.core.asm;

import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand All @@ -13,29 +12,18 @@
import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader;

import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.Name;
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex;
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions;
import micdoodle8.mods.galacticraft.core.Constants;
import micdoodle8.mods.galacticraft.core.mixins.Mixins;

/**
* Holds the rest of GC's class patching code.
*/
@TransformerExclusions("micdoodle8.mods.galacticraft.core.asm")
@MCVersion("1.7.10")
@Name(Constants.COREMOD_NAME_SIMPLE)
@SortingIndex(1500)
@IFMLLoadingPlugin.MCVersion("1.7.10")
@IFMLLoadingPlugin.Name(Constants.COREMOD_NAME_SIMPLE)
public class GCLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {

static final Logger LOGGER = LogManager.getLogger(Constants.COREMOD_NAME_SIMPLE);
static boolean dev;
static File debugOutputDir;
private static final Logger LOGGER = LogManager.getLogger(Constants.COREMOD_NAME_SIMPLE);

@Override
public String[] getASMTransformerClass() {
return new String[] { "micdoodle8.mods.galacticraft.core.asm.GCTransformer" };
return null;
}

@Override
Expand All @@ -49,12 +37,7 @@ public String getSetupClass() {
}

@Override
public void injectData(Map<String, Object> data) {
dev = !(boolean) data.get("runtimeDeobfuscationEnabled");
debugOutputDir = new File((File) data.get("mcLocation"), ".asm");
// noinspection ResultOfMethodCallIgnored
debugOutputDir.mkdir();
}
public void injectData(Map<String, Object> data) {}

@Override
public String getAccessTransformerClass() {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 326e02a

Please sign in to comment.