Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
id 'maven-publish'
id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.7'
id 'eclipse'
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.19'
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26'
id 'com.matthewprenger.cursegradle' version '1.4.0'
}

Expand All @@ -21,8 +21,6 @@ archivesBaseName = project.archives_base_name
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
// Azul covers the most platforms for Java 8 toolchains, crucially including MacOS arm64
vendor.set(AZUL)
}
// Generate sources and javadocs jars when building and publishing
// withSourcesJar()
Expand Down Expand Up @@ -106,7 +104,6 @@ dependencies {
implementation 'zone.rong:mixinbooter:8.2'
}

implementation("com.fasterxml.jackson.core:jackson-core:2.12.5")
implementation("com.google.code.findbugs:jsr305:3.0.2")
compileOnly rfg.deobf("curse.maven:industrial-craft-2-242638:3838713")

Expand All @@ -125,7 +122,7 @@ dependencies {

if (project.use_mixins.toBoolean()) {
// Change your mixin refmap name here:
String mixin = modUtils.enableMixins('zone.rong:mixinbooter:8.2', "mixins.${project.archives_base_name}.refmap.json")
String mixin = modUtils.enableMixins('zone.rong:mixinbooter:8.9', "mixins.${project.archives_base_name}.refmap.json")
api(mixin) {
transitive = false
}
Expand Down
7 changes: 5 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,16 @@ startGitRev=8e676bd
use_spark = false

# Boilerplate Options
use_mixins = false
use_coremod = false
use_mixins = true
use_coremod = true
use_assetmover = false

# Access Transformer files should be in the root of `resources` folder and with the filename formatted as: `{archives_base_name}_at.cfg`
use_access_transformer = true

# Is Coremod include mod or not, and coremod name
include_mod = true
coremod_plugin_class_name = zmaster587.advancedRocketry.asm.AdvancedRocketryPlugin

# Dependencies
libVulpesVersion=0.4.2
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package zmaster587.advancedRocketry.annotation;

import java.lang.annotation.Retention;
import java.lang.annotation.Target;

import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.CLASS;

@Retention(CLASS)
@Target(TYPE)
public @interface LateMixin {
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions;
import zone.rong.mixinbooter.IEarlyMixinLoader;

import java.util.Collections;
import java.util.List;
import java.util.Map;

@TransformerExclusions(value = {"zmaster587.advancedRocketry.asm.ClassTransformer"})
@MCVersion("1.12.2")
public class AdvancedRocketryPlugin implements IFMLLoadingPlugin {
public class AdvancedRocketryPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {

public AdvancedRocketryPlugin() {
// TODO Auto-generated constructor stub
Expand Down Expand Up @@ -41,4 +44,8 @@ public String getAccessTransformerClass() {
return null;
}

@Override
public List<String> getMixinConfigs() {
return Collections.singletonList("mixins.advancedrocketry.json");
}
}
13 changes: 13 additions & 0 deletions src/main/java/zmaster587/advancedRocketry/asm/LateMixin.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package zmaster587.advancedRocketry.asm;

import zone.rong.mixinbooter.ILateMixinLoader;

import java.util.Collections;
import java.util.List;

public class LateMixin implements ILateMixinLoader {
@Override
public List<String> getMixinConfigs() {
return Collections.singletonList("mixins.advancedrocketry.late.json");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package zmaster587.advancedRocketry.asm.mixin.early.minecraft;

import net.minecraft.world.DimensionType;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import zmaster587.advancedRocketry.AdvancedRocketry;
import zmaster587.advancedRocketry.dimension.DimensionManager;
import zmaster587.advancedRocketry.dimension.DimensionProperties;

@Mixin(DimensionType.class)
public abstract class DimensionTypeMixin {

@Inject(method = "getName", at = @At("RETURN"), cancellable = true)
public void onGetName(CallbackInfoReturnable<String> ci) {

AdvancedRocketry.logger.info("DimensionTypeMixin");

DimensionProperties dimensionProperties = DimensionManager.getInstance().getDimensionProperties(getId());

AdvancedRocketry.logger.info("Found dimensionProperties: " + dimensionProperties);

AdvancedRocketry.logger.info("Found dimensionProperties with name: " + dimensionProperties.getName());

if (dimensionProperties == DimensionManager.overworldProperties) {

AdvancedRocketry.logger.info("Seems to be overworld, returning");
return;
}

AdvancedRocketry.logger.info("Returning with dim name");

ci.setReturnValue(dimensionProperties.getName());
}

@Shadow
public abstract int getId();

}
15 changes: 15 additions & 0 deletions src/main/resources/mixins.advancedrocketry.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"required": true,
"minVersion": "0.8",
"package": "zmaster587.advancedRocketry.asm.mixin.early",
"refmap": "mixins.advancedrocketry.refmap.json",
"compatibilityLevel": "JAVA_8",
"mixins": [
"minecraft.DimensionTypeMixin"
],
"client": [
],
"injectors": {
"defaultRequire": 1
}
}
14 changes: 14 additions & 0 deletions src/main/resources/mixins.advancedrocketry.late.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"required": true,
"minVersion": "0.8",
"package": "zmaster587.advancedRocketry.asm.mixin.late",
"refmap": "mixins.advancedrocketry.refmap.json",
"compatibilityLevel": "JAVA_8",
"mixins": [
],
"client": [
],
"injectors": {
"defaultRequire": 1
}
}