From 3cd5f5f32cd60c15e1c68862d28885f733473dad Mon Sep 17 00:00:00 2001 From: ingle Date: Fri, 23 Sep 2022 22:24:48 -0500 Subject: Some things work now --- src/main/java/com/dulkirmod/DulkirMod.java | 26 ----------- src/main/java/com/dulkirmod/Settings.java | 6 --- .../com/dulkirmod/mixin/MixinRendererManager.java | 52 ---------------------- src/main/java/com/dulkirmod/mixin/MixinWorld.java | 20 --------- .../dulkirmod/mixins/MixinRendererManager.java | 52 ++++++++++++++++++++++ src/main/java/dulkirmod/mixins/MixinWorld.java | 23 ++++++++++ 6 files changed, 75 insertions(+), 104 deletions(-) delete mode 100644 src/main/java/com/dulkirmod/DulkirMod.java delete mode 100644 src/main/java/com/dulkirmod/Settings.java delete mode 100644 src/main/java/com/dulkirmod/mixin/MixinRendererManager.java delete mode 100644 src/main/java/com/dulkirmod/mixin/MixinWorld.java create mode 100644 src/main/java/dulkirmod/mixins/MixinRendererManager.java create mode 100644 src/main/java/dulkirmod/mixins/MixinWorld.java (limited to 'src/main/java') diff --git a/src/main/java/com/dulkirmod/DulkirMod.java b/src/main/java/com/dulkirmod/DulkirMod.java deleted file mode 100644 index 937031f..0000000 --- a/src/main/java/com/dulkirmod/DulkirMod.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.dulkirmod; - -import com.dulkirmod.commands.Commands; -import net.minecraft.init.Blocks; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; - -import javax.swing.text.JTextComponent; - -@Mod(modid = "dulkirmod", version = "1.0.0") -public class DulkirMod { - public Commands commands; - - @Mod.EventHandler - public void init(FMLInitializationEvent event) { - System.out.println("Dirt: " + Blocks.dirt.getUnlocalizedName()); - } - - @Mod.EventHandler - public void preinit(FMLPreInitializationEvent event) { - this.commands = new Commands(); - } - - -} diff --git a/src/main/java/com/dulkirmod/Settings.java b/src/main/java/com/dulkirmod/Settings.java deleted file mode 100644 index 316aa2f..0000000 --- a/src/main/java/com/dulkirmod/Settings.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.dulkirmod; - -public class Settings { - public static boolean EnchantRune = true; - public static boolean HealerFairy = true; -} diff --git a/src/main/java/com/dulkirmod/mixin/MixinRendererManager.java b/src/main/java/com/dulkirmod/mixin/MixinRendererManager.java deleted file mode 100644 index 359b67e..0000000 --- a/src/main/java/com/dulkirmod/mixin/MixinRendererManager.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.dulkirmod.mixin; - -import com.dulkirmod.Settings; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityArmorStand; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(RenderManager.class) -public class MixinRendererManager { - - @Inject(method = "doRenderEntity", at = @At("HEAD"), cancellable = true) - public void doRender( - Entity entity, - double x, - double y, - double z, - float entityYaw, - float partialTicks, - boolean p_147939_10_, - CallbackInfoReturnable cir - ) { - if(!Settings.HealerFairy) return; - if (entity instanceof EntityArmorStand) { - if (((EntityArmorStand) entity).getHeldItem() != null && ((EntityArmorStand) entity).getHeldItem().getItem() == Items.skull) { - ItemStack stack = ((EntityArmorStand) entity).getHeldItem(); - if (stack.hasTagCompound() && stack.getTagCompound().hasKey("SkullOwner")) { - NBTTagCompound skullOwner = stack.getTagCompound().getCompoundTag("SkullOwner"); - if (skullOwner.hasKey("Properties")) { - NBTTagCompound properties = skullOwner.getCompoundTag("Properties"); - if (properties.hasKey("textures")) { - //if (properties.getTagList("textures", 10).tagCount() >= 1) { - if ("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTZjM2UzMWNmYzY2NzMzMjc1YzQyZmNmYjVkOWE0NDM0MmQ2NDNiNTVjZDE0YzljNzdkMjczYTIzNTIifX19" - .equals(properties.getTagList("textures", 10).getCompoundTagAt(0).getString("Value"))) - cir.cancel(); - //} - } - - } - - } - - } - } - } -} \ No newline at end of file diff --git a/src/main/java/com/dulkirmod/mixin/MixinWorld.java b/src/main/java/com/dulkirmod/mixin/MixinWorld.java deleted file mode 100644 index 8ae76cd..0000000 --- a/src/main/java/com/dulkirmod/mixin/MixinWorld.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.dulkirmod.mixin; - -import net.minecraft.world.World; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.dulkirmod.Settings; - -@Mixin(World.class) -public class MixinWorld { - - @Inject(method = "spawnParticle(IZDDDDDD[I)V", at = @At("HEAD"), cancellable = true) - public void onInitGui(int particleID, boolean p_175720_2_, double xCood, double yCoord, double zCoord, - double xOffset, double yOffset, double zOffset, int[] p_175720_15_, CallbackInfo ci) { - if (particleID == 25 && Settings.EnchantRune) { - ci.cancel(); - } - } -} diff --git a/src/main/java/dulkirmod/mixins/MixinRendererManager.java b/src/main/java/dulkirmod/mixins/MixinRendererManager.java new file mode 100644 index 0000000..b545107 --- /dev/null +++ b/src/main/java/dulkirmod/mixins/MixinRendererManager.java @@ -0,0 +1,52 @@ +package dulkirmod.mixins; + +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityArmorStand; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import dulkirmod.DulkirMod; + +@Mixin(RenderManager.class) +public class MixinRendererManager { + + @Inject(method = "doRenderEntity", at = @At("HEAD"), cancellable = true) + public void doRender( + Entity entity, + double x, + double y, + double z, + float entityYaw, + float partialTicks, + boolean p_147939_10_, + CallbackInfoReturnable cir + ) { + if(!DulkirMod.Companion.getConfig().getHideHealerFairy()) return; + if (entity instanceof EntityArmorStand) { + if (((EntityArmorStand) entity).getHeldItem() != null && ((EntityArmorStand) entity).getHeldItem().getItem() == Items.skull) { + ItemStack stack = ((EntityArmorStand) entity).getHeldItem(); + if (stack.hasTagCompound() && stack.getTagCompound().hasKey("SkullOwner")) { + NBTTagCompound skullOwner = stack.getTagCompound().getCompoundTag("SkullOwner"); + if (skullOwner.hasKey("Properties")) { + NBTTagCompound properties = skullOwner.getCompoundTag("Properties"); + if (properties.hasKey("textures")) { + //if (properties.getTagList("textures", 10).tagCount() >= 1) { + if ("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTZjM2UzMWNmYzY2NzMzMjc1YzQyZmNmYjVkOWE0NDM0MmQ2NDNiNTVjZDE0YzljNzdkMjczYTIzNTIifX19" + .equals(properties.getTagList("textures", 10).getCompoundTagAt(0).getString("Value"))) + cir.cancel(); + //} + } + + } + + } + + } + } + } +} \ No newline at end of file diff --git a/src/main/java/dulkirmod/mixins/MixinWorld.java b/src/main/java/dulkirmod/mixins/MixinWorld.java new file mode 100644 index 0000000..97133e1 --- /dev/null +++ b/src/main/java/dulkirmod/mixins/MixinWorld.java @@ -0,0 +1,23 @@ +package dulkirmod.mixins; + +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import dulkirmod.DulkirMod; + +@Mixin(World.class) +public class MixinWorld { + + @Inject(method = "spawnParticle(IZDDDDDD[I)V", at = @At("HEAD"), cancellable = true) + public void onInitGui(int particleID, boolean p_175720_2_, double xCood, double yCoord, double zCoord, + double xOffset, double yOffset, double zOffset, int[] p_175720_15_, CallbackInfo ci) { + if (particleID == 25 && DulkirMod.Companion.getConfig().getHideEnchantRune()) { + ci.cancel(); + } + else if (particleID == 34 && DulkirMod.Companion.getConfig().getHideHeartParticles()) { + ci.cancel(); + } + } +} -- cgit