turn remapping back on

oopsies
rhysdh540 · Feb 12, 2024 · a0a68a1 · a0a68a1
1 parent 06f76f8
commit a0a68a1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/buildSrc/src/main/java/JarPostProcessorPlugin.java b/buildSrc/src/main/java/JarPostProcessorPlugin.java
@@ -56,6 +56,8 @@ public void apply(Project project) {
 					return bytes;
 				});
 
+				entries.entrySet().removeIf(entry -> entry.getKey().startsWith("META-INF/services/"));
+
 				try(JarOutputStream out = new JarOutputStream(Files.newOutputStream(output.toPath()))) {
 					out.setLevel(Deflater.BEST_COMPRESSION);
 					entries.forEach((name, bytes) -> {

diff --git a/common/src/main/java/dev/rdh/createunlimited/mixin/CarriageContraptionMixin.java b/common/src/main/java/dev/rdh/createunlimited/mixin/CarriageContraptionMixin.java
@@ -11,7 +11,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 
 @SuppressWarnings("unused")
-@Mixin(value = CarriageContraption.class, remap = false)
+@Mixin(CarriageContraption.class)
 public abstract class CarriageContraptionMixin {
 	@ModifyExpressionValue(method = "assemble", at = @At(value = "INVOKE", target = "Ljava/util/Map;size()I", ordinal = 0))
 	private int modifyMinBlocksOnTrain(int original) {

diff --git a/common/src/main/java/dev/rdh/createunlimited/mixin/CopycatBlockMixin.java b/common/src/main/java/dev/rdh/createunlimited/mixin/CopycatBlockMixin.java
@@ -11,7 +11,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 
 @SuppressWarnings("unused")
-@Mixin(value = CopycatBlock.class, remap = false)
+@Mixin(CopycatBlock.class)
 public abstract class CopycatBlockMixin {
 	@ModifyExpressionValue(method = "getAcceptedBlockState", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/decoration/copycat/CopycatBlock;isAcceptedRegardless(Lnet/minecraft/world/level/block/state/BlockState;)Z"))
 	private boolean isAcceptedRegardless(boolean original) {

diff --git a/common/src/main/java/dev/rdh/createunlimited/mixin/TrackTargetingBlockItemMixin.java b/common/src/main/java/dev/rdh/createunlimited/mixin/TrackTargetingBlockItemMixin.java
@@ -10,7 +10,7 @@
 
 import com.simibubi.create.content.trains.track.TrackTargetingBlockItem;
 
-@Mixin(value = TrackTargetingBlockItem.class, remap = false)
+@Mixin(TrackTargetingBlockItem.class)
 public class TrackTargetingBlockItemMixin {
 	@ModifyExpressionValue(method = "useOn", at = {
 		@At(value = "CONSTANT", args = "doubleValue=80.0"),

diff --git a/common/src/main/java/dev/rdh/createunlimited/mixin/TrainMixin.java b/common/src/main/java/dev/rdh/createunlimited/mixin/TrainMixin.java
@@ -10,7 +10,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-@Mixin(value = Train.class, remap = false)
+@Mixin(Train.class)
 public abstract class TrainMixin {
 	@ModifyExpressionValue(method = "tick", at = @At(value = "CONSTANT", args = "doubleValue=4.0"))
 	private double modifyMaxStress(double original) {