Skip to content

Commit 9192bbc

Browse files
fixing a mixin crash
1 parent f15faa1 commit 9192bbc

File tree

5 files changed

+6
-21
lines changed

5 files changed

+6
-21
lines changed

src/main/java/com/rae/creatingspace/mixin/CSMixinPlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.rae.creatingspace.mixin;
22

3-
import com.simibubi.create.compat.Mods;
43
import org.objectweb.asm.tree.ClassNode;
54
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
65
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;

src/main/java/com/rae/creatingspace/mixin/entity/gravity/BoatMixin.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.rae.creatingspace.mixin.entity.gravity;
22

33
import com.rae.creatingspace.content.planets.CSDimensionUtil;
4-
import net.minecraft.resources.ResourceLocation;
54
import net.minecraft.world.entity.Entity;
65
import net.minecraft.world.entity.EntityType;
76
import net.minecraft.world.entity.vehicle.Boat;
@@ -17,7 +16,10 @@ public abstract class BoatMixin extends Entity {
1716
public BoatMixin(EntityType<?> p_19870_, Level p_19871_) {
1817
super(p_19870_, p_19871_);
1918
}
20-
19+
//TODO verify that it's correct in the mixin.out (it should look like
20+
// if (injected(d1) > (double)0.0F) {
21+
// ....
22+
// }
2123
@ModifyVariable(method = "floatBoat", at = @At(value = "LOAD"), name = "d1")
2224
private double modifyGravity(double d1) {
2325
if (shouldHandleGravity(level().dimension().location())) {

src/main/java/com/rae/creatingspace/mixin/entity/gravity/LivingEntityMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private double modifyGravity(double d0) {
2626
return d0;
2727
}
2828

29-
@ModifyVariable(method = "calculateFallDamage", at = @At(value = "LOAD"), name = "fallDistance")
29+
@ModifyVariable(method = "calculateFallDamage", at = @At(value = "HEAD"), ordinal = 0, argsOnly = true)
3030
public float calculateFallDamage(float distance) {
3131
if (shouldHandleGravity(level().dimension().location())) {
3232
return (float) (distance * CSDimensionUtil.gravity(level().dimension().location()) / 9.81);

src/main/java/com/rae/creatingspace/mixin/recipe/ProcessingRecipeSerializerMixin.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,20 @@
11
package com.rae.creatingspace.mixin.recipe;
22

3-
import com.google.gson.JsonElement;
4-
import com.google.gson.JsonObject;
5-
import com.mojang.datafixers.util.Either;
63
import com.mojang.serialization.Codec;
74
import com.mojang.serialization.MapCodec;
85
import com.mojang.serialization.codecs.RecordCodecBuilder;
96
import com.rae.creatingspace.content.recipes.IMoreNbtConditions;
10-
import com.simibubi.create.AllRecipeTypes;
11-
import com.simibubi.create.content.processing.recipe.*;
12-
import com.simibubi.create.foundation.fluid.FluidIngredient;
13-
import net.minecraft.core.NonNullList;
7+
import com.simibubi.create.content.processing.recipe.StandardProcessingRecipe;
148
import net.minecraft.nbt.NbtOps;
159
import net.minecraft.network.RegistryFriendlyByteBuf;
16-
import net.minecraft.network.codec.ByteBufCodecs;
1710
import net.minecraft.network.codec.StreamCodec;
18-
import net.minecraft.resources.ResourceLocation;
19-
import net.minecraft.util.ExtraCodecs;
20-
import net.minecraft.util.GsonHelper;
21-
import net.minecraft.world.item.crafting.Ingredient;
22-
import net.neoforged.neoforge.fluids.FluidStack;
23-
import org.spongepowered.asm.mixin.Final;
2411
import org.spongepowered.asm.mixin.Mixin;
25-
import org.spongepowered.asm.mixin.Shadow;
2612
import org.spongepowered.asm.mixin.injection.At;
2713
import org.spongepowered.asm.mixin.injection.Inject;
2814
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
2915

3016
import java.util.ArrayList;
3117
import java.util.List;
32-
import java.util.function.Supplier;
3318

3419
@Mixin(value = StandardProcessingRecipe.Serializer.class)
3520
public abstract class ProcessingRecipeSerializerMixin {

src/main/resources/creatingspace.mixins.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"priority": 900,
55
"package": "com.rae.creatingspace.mixin",
66
"compatibilityLevel": "JAVA_17",
7-
"refmap": "creatingspace.refmap.json",
87
"plugin": "com.rae.creatingspace.mixin.CSMixinPlugin",
98
"mixins": [
109
"entity.ContraptionMixin",

0 commit comments

Comments
 (0)