Remove unused mixin, update mixins to target Java 17, aiStep is forge-only?

This commit is contained in:
Andrew Pietila 2023-07-14 19:34:00 -05:00
parent f7a6b83578
commit d7131d348d
3 changed files with 2 additions and 71 deletions

View file

@ -17,7 +17,7 @@ public abstract class BlazeMixin extends Monster {
super(entityType, level);
}
@Inject(at=@At("HEAD"), method="aiStep")
@Inject(at=@At("HEAD"), method="aiStep", remap = false)
public void aiStep(CallbackInfo ci) {
CommonMixinHooks.handleBlazeSmoke((Blaze)(Object)this);
}

View file

@ -1,69 +0,0 @@
package fathertoast.specialmobs.common.mixin;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.GameSettings;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.entity.EntityRendererManager;
import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.entity.Entity;
import net.minecraft.resources.IReloadableResourceManager;
import net.minecraft.world.IWorldReader;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
/**
* This is our EntityRendererManager mixin!
*
* All mixin classes must be annotated with @Mixin(TargetClass)
*
* Also note that all mixin classes must exist in their own dedicated mixin package. Having a non-mixin class
* inside the package you have specified to be your mixin package will not go well.
*
* Its a good rule of thumb to make your mixin classes abstract, as they should never be instantiated.
*
* This mixin example is not fantastic as it only scratches the surface of the worm can that is mixin,
* but I figured it at least had some relevance since shadow render canceling was a topic earlier.
*
* NOTE: All mixins must be registered in the mod's mixin config.
* the mixin config can be found inside the mod's resources folder: "specialmobs.mixins.json".
* When you remove this mixin from the config, it will no longer be active.
*/
@Mixin(EntityRendererManager.class)
public abstract class EntityRendererManagerMixin {
/**
* Constructor matching target class constructor. Not required in this case, but generally nice to have
*/
public EntityRendererManagerMixin(TextureManager textureManager, ItemRenderer p_i226034_2_, IReloadableResourceManager resourceManager, FontRenderer fontRenderer, GameSettings gameSettings) {
}
/**
* Simple redirect injection.
*
* Here we use the @Redirect annotation on a target method in our mixin target class.
* This annotation lets us swap out invocations in the target method with our own.
*
* The first parameter of annotation is the target method name; the method we will be messing around with
* The second parameter is the "at" (where in the target method should we look for invocations to swap?)
*
* There are various ways to determine where we want to do things, but in this specific example,
* we want to cancel every call to "renderShadow" in the target method.
*
* value = "INVOKE" - This specifies that we should only look for INVOKE opcodes
* target = "Lnet/minecraft/client..blah..blah" - This is the full name of the member we want to redirect, in this case "renderShadow"
*
* As you can see, our injection method has an empty body. This is because we wish to do absolutely nothing instead of rendering entity shadows.
*
* NOTE: It is required that our injected method has the same parameters as our target, as shown below.
* the "name" of our injection method does not matter. It can be anything, but its not a bad idea to
* name it something intuitive.
*/
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/EntityRendererManager;renderShadow(Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;Lnet/minecraft/entity/Entity;FFLnet/minecraft/world/IWorldReader;F)V"))
public void onRender(MatrixStack matrixStack, IRenderTypeBuffer buffer, Entity entity, float p_229096_3_, float p_229096_4_, IWorldReader worldReader, float p_229096_6_) {
}
}

View file

@ -1,7 +1,7 @@
{
"required": true,
"package": "fathertoast.specialmobs.common.mixin",
"compatibilityLevel": "JAVA_8",
"compatibilityLevel": "JAVA_17",
"minVersion": "0.8",
"refmap": "specialmobs.mixins.refmap.json",
"mixins": [