changes from 1.21.11

Author: m1919810

build.gradle

@@ -98,6 +98,7 @@ spotless {
 				.style('PALANTIR')
 
 		removeUnusedImports()
+		trimTrailingWhitespace()
 		endWithNewline()
 	}
 }

src/main/java/me/matl114/events/RenderListener.java

@@ -31,7 +31,7 @@ public static void init() {}
     @ExtraArgs(
             value = {ItemStack.class},
             names = {"originalItemStack"})
-    private static final EventChannel<ItemModel> customModelOverride = new EventChannel<>();
+    private static final EventChannel<Identifier> customModelOverride = new EventChannel<>();
 
     public static Identifier wrapAsModModel(Identifier id) {
         return id;

src/main/java/me/matl114/hacks/modules/models/NewStyleModel.java

@@ -55,9 +55,9 @@ public void registerAll() {
 
     private Map<Identifier, Optional<ItemModel>> cache = new HashMap<>();
 
-    private Map<Item, Optional<ItemModel>> cacheItem = new HashMap<>();
+    private Map<Item, Identifier> cacheItem = new HashMap<>();
 
-    public void onModelOverride(Event<ItemModel> event) {
+    public void onModelOverride(Event<Identifier> event) {
         if (event.context != null) return;
         ItemStack item = event.getArgs(0);
         if (enableEnchant.get()) {
@@ -85,15 +85,17 @@ public void onModelOverride(Event<ItemModel> event) {
                                                 : new Identifier(
                                                         NAMESPACE, MODEL_PATH + identifier2.getPath() + "_" + level))));
                         Optional<ItemModel> modelId = cache.computeIfAbsent(id, RenderListener::getModModel);
-                        modelId.ifPresent(event::context);
+                        if (modelId.isPresent()) {
+                            event.context(id);
+                        }
                     }
                 }
             }
         }
         if (shouldEnableNewStyle(item)) {
             var model = cacheItem.get(item.getItem());
-            if (model != null && model.isPresent()) {
-                event.context(model.get());
+            if (model != null) {
+                event.context(model);
             }
         }
     }
@@ -108,7 +110,7 @@ public void onRefreshCache(Event<ResourceManager> event) {
             Optional<ItemModel> modelId = RenderListener.getModModel(id);
             // todo: what?
             if (modelId.isPresent()) {
-                cacheItem.put(item, modelId);
+                cacheItem.put(item, id);
                 Debug.info("Loading new-version model", id);
             }
         }

src/main/java/me/matl114/hacks/modules/models/SlimefunModels.java

@@ -69,7 +69,7 @@ public void onModelSupply(Event<Set<Identifier>> event) {
         }
     }
 
-    public void onModelOverride(Event<ItemModel> event) {
+    public void onModelOverride(Event<Identifier> event) {
         if (event.context != null) return;
 
         if (enableModel.get()) {
@@ -83,7 +83,7 @@ public void onModelOverride(Event<ItemModel> event) {
                         Optional<ItemModel> modelOptional =
                                 modelCache.computeIfAbsent(identifier, RenderListener::getOptionalModelOf);
                         if (modelOptional.isPresent()) {
-                            event.context(modelOptional.get());
+                            event.context(identifier);
                             return;
                         }
                     }

src/main/java/me/matl114/hacks/modules/models/StorageDisplay.java

@@ -19,7 +19,6 @@
 import me.matl114.managers.config.FlagRef;
 import me.matl114.utils.EntityUtils;
 import me.matl114.utils.ItemStackUtils;
-import net.minecraft.client.render.item.model.ItemModel;
 import net.minecraft.entity.EntityType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -187,16 +186,16 @@ public void onProductsSpecialPlugin(Event<ItemStack> event) {
         }
     }
 
-    public void onGceChickenModel(Event<ItemModel> IItemModelEvent) {
+    public void onGceChickenModel(Event<Identifier> IItemModelEvent) {
         if (IItemModelEvent.context() != null) return;
         if (isActive()) {
             ItemStack stack = IItemModelEvent.getArgs(0);
             String optionalChicken = handlePureChickenDNAInfo(stack);
             if (optionalChicken != null) {
                 String val = dnaInfo.get(optionalChicken);
                 if (val != null) {
-                    RenderListener.getModModel(new Identifier("slimefunhelper", "gce/" + val))
-                            .ifPresent(IItemModelEvent::context);
+                    Identifier id = new Identifier("slimefunhelper", "gce/" + val);
+                    RenderListener.getModModel(id).ifPresent((v) -> IItemModelEvent.context(id));
                 }
             }
         }

src/main/resources/assets/slimefunhelper/lang/en_us.json

@@ -132,6 +132,7 @@
 	"att-bot.mace-height-multiply.tooltips": "值不应高于170,若同时使用TP Reach,则值不应高于140/100",
 	"att-bot.mace-pass-totem": "武器攻击:重锤pass图腾",
 	"att-bot.mace-pass-totem.tooltips": "测试功能\n不稳定",
+	"att-bot.mace-enable": "武器攻击:启用重锤",
 	"att-bot.opposite-attack-multiply": "武器攻击:身后实体加权",
 	"att-bot.opposite-attack-multiply.tooltips": "在玩家身后的实体在进行攻击目标选取的时候会获得此加权值\u000A这是为了防止反作弊插件在玩家身后生成假人来测试杀戮\n不加权情况为0.0D,值越大,身后实体越不可能被攻击",
 	"att-bot.player-attack-multiply": "武器攻击:玩家加权",