aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kubatech/mixin
diff options
context:
space:
mode:
authorJakub <53441451+kuba6000@users.noreply.github.com>2023-06-22 23:48:40 +0200
committerGitHub <noreply@github.com>2023-06-22 23:48:40 +0200
commit705dec10c37a7f878f11aad11ea4615a7c08ec00 (patch)
tree96d8f4eaa486eed2cb9bb3b469007354a48743b2 /src/main/java/kubatech/mixin
parent4f7ebceca5992e3d81f86b264460f38db27eb28b (diff)
downloadGT5-Unofficial-705dec10c37a7f878f11aad11ea4615a7c08ec00.tar.gz
GT5-Unofficial-705dec10c37a7f878f11aad11ea4615a7c08ec00.tar.bz2
GT5-Unofficial-705dec10c37a7f878f11aad11ea4615a7c08ec00.zip
Remove Mobs Info NEI page from KubaTech (#82)
* Add Mobs Info * Use MobsInfo * Update dependencies.gradle * Update repositories.gradle * Update GT_MetaTileEntity_ExtremeExterminationChamber.java * Update dependencies.gradle
Diffstat (limited to 'src/main/java/kubatech/mixin')
-rw-r--r--src/main/java/kubatech/mixin/Mixin.java11
-rw-r--r--src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java40
2 files changed, 5 insertions, 46 deletions
diff --git a/src/main/java/kubatech/mixin/Mixin.java b/src/main/java/kubatech/mixin/Mixin.java
index 19e3b32610..e94eca69bb 100644
--- a/src/main/java/kubatech/mixin/Mixin.java
+++ b/src/main/java/kubatech/mixin/Mixin.java
@@ -11,7 +11,6 @@ import cpw.mods.fml.relauncher.FMLLaunchHandler;
public enum Mixin {
// Minecraft
- EnchantmentHelperMixin("minecraft.EnchantmentHelperMixin", VANILLA),
WorldMixin("minecraft.WorldMixin", VANILLA),
EntityAccessor("minecraft.EntityAccessor", VANILLA),
EntityLivingAccessor("minecraft.EntityLivingAccessor", VANILLA),
@@ -47,10 +46,10 @@ public enum Mixin {
.isClient())
&& new HashSet<>(loadedMods).containsAll(targetedMods);
}
-}
-enum Side {
- BOTH,
- CLIENT,
- SERVER
+ enum Side {
+ BOTH,
+ CLIENT,
+ SERVER
+ }
}
diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java
deleted file mode 100644
index 9df946b6aa..0000000000
--- a/src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package kubatech.mixin.mixins.minecraft;
-
-import static kubatech.loaders.MobRecipeLoader.randomEnchantmentDetectedString;
-
-import java.util.Random;
-
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagInt;
-
-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.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import kubatech.api.utils.FastRandom;
-import kubatech.loaders.MobRecipeLoader;
-
-@SuppressWarnings("unused")
-@Mixin(value = EnchantmentHelper.class)
-public class EnchantmentHelperMixin {
-
- private static final Random rnd = new FastRandom();
-
- @Inject(method = "addRandomEnchantment", at = @At("HEAD"), require = 1)
- private static void addRandomEnchantmentDetector(Random random, ItemStack itemStack, int enchantabilityLevel,
- CallbackInfoReturnable<ItemStack> callbackInfoReturnable) {
- if (MobRecipeLoader.isInGenerationProcess && random instanceof MobRecipeLoader.fakeRand) {
- itemStack.setTagInfo(randomEnchantmentDetectedString, new NBTTagInt(enchantabilityLevel));
- }
- }
-
- @ModifyVariable(method = "addRandomEnchantment", at = @At("HEAD"), ordinal = 0, argsOnly = true, require = 1)
- private static Random addRandomEnchantmentModifier(Random random) {
- if (!MobRecipeLoader.isInGenerationProcess) return random;
- if (random instanceof MobRecipeLoader.fakeRand) return rnd;
- return random;
- }
-}