Merge branch '1.21.x' into recipe-condition-icons

Author: Technici4n

gradle.properties

@@ -9,8 +9,8 @@ org.gradle.jvmargs=-Xmx2G \
 
 # Core NeoForge properties
 minecraft_version=1.21.1
-neo_version=21.1.37
-neo_version_range=[21.1.37, 22-)
+neo_version=21.1.60
+neo_version_range=[21.1.60, 22-)
 # For latest see https://parchmentmc.org/docs/getting-started
 neoForge.parchment.minecraftVersion=1.21
 neoForge.parchment.mappingsVersion=2024.07.28

src/client/java/aztech/modern_industrialization/compat/viewer/usage/MachineCategory.java

@@ -30,6 +30,7 @@
 import aztech.modern_industrialization.MIText;
 import aztech.modern_industrialization.MITooltips;
 import aztech.modern_industrialization.compat.rei.machines.MachineCategoryParams;
+import aztech.modern_industrialization.compat.rei.machines.SteamMode;
 import aztech.modern_industrialization.compat.viewer.abstraction.ViewerCategory;
 import aztech.modern_industrialization.inventory.SlotPositions;
 import aztech.modern_industrialization.machines.gui.MachineScreen;
@@ -209,9 +210,11 @@ public void buildWidgets(RecipeHolder<MachineRecipe> recipeHolder, WidgetList wi
 
             guiGraphics.pose().popPose();
         });
-        widgets.text(
-                TextHelper.getEuTextTick(recipe.eu),
-                15 + (params.steamMode.steam ? 2 : 0), 5, TextAlign.LEFT, false, true, null);
+        if (params.steamMode != SteamMode.NEITHER) {
+            widgets.text(
+                    TextHelper.getEuTextTick(recipe.eu),
+                    15 + (params.steamMode.steam ? 2 : 0), 5, TextAlign.LEFT, false, true, null);
+        }
         widgets.text(
                 MIText.BaseDurationSeconds.text(getSeconds(recipe)),
                 width - 5, 5, TextAlign.RIGHT, false, true, null);
@@ -259,7 +262,9 @@ public void buildWidgets(RecipeHolder<MachineRecipe> recipeHolder, WidgetList wi
         }
         // Tooltips
         List<Component> tooltips = new ArrayList<>();
-        tooltips.add(MIText.BaseEuTotal.text(TextHelper.getEuText((long) recipe.duration * recipe.eu)));
+        if (params.steamMode != SteamMode.NEITHER) {
+            tooltips.add(MIText.BaseEuTotal.text(TextHelper.getEuText((long) recipe.duration * recipe.eu)));
+        }
         if (params.steamMode.steam) {
             tooltips.add((params.steamMode.electric ? MIText.AcceptsSteamToo : MIText.AcceptsSteam).text().withStyle(ChatFormatting.GRAY));
             if (steelHatchRequired) {
@@ -275,7 +280,9 @@ public void buildWidgets(RecipeHolder<MachineRecipe> recipeHolder, WidgetList wi
                 condition.appendDescription(tooltips);
             }
         }
-        widgets.tooltip(2, 5, width - 10, 11, tooltips);
+        if (!tooltips.isEmpty()) {
+            widgets.tooltip(2, 5, width - 10, 11, tooltips);
+        }
     }
 
     private double getSeconds(MachineRecipe recipe) {

src/generated/resources/assets/modern_industrialization/lang/en_us.json

@@ -1500,7 +1500,8 @@
   "text.modern_industrialization.AcceptsSteamToo": "Also Accepts Steam (1 mb \u003d 1 EU)",
   "text.modern_industrialization.AcceptsUpgrades": "Add upgrades to increase max processing EU/t.",
   "text.modern_industrialization.Activated": "Activated",
-  "text.modern_industrialization.AllowCreativeFlight": "Allow Creative Flight",
+  "text.modern_industrialization.AttributeInfiniteDamage": "Infinite Damage",
+  "text.modern_industrialization.AttributeQuantumArmor": "Quantum Armor",
   "text.modern_industrialization.BarrelStack": "Can store up to %d stacks",
   "text.modern_industrialization.BarrelStorageComponent": "%s / %s (%s)",
   "text.modern_industrialization.BaseDurationSeconds": "%s sec",

src/main/java/aztech/modern_industrialization/MI.java

@@ -65,7 +65,10 @@
 import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.repository.PackCompatibility;
 import net.minecraft.server.packs.repository.PackSource;
+import net.minecraft.util.Mth;
 import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.flag.FeatureFlagSet;
 import net.minecraft.world.inventory.AnvilMenu;
 import net.minecraft.world.item.ItemStack;
@@ -80,6 +83,8 @@
 import net.neoforged.neoforge.event.AddPackFindersEvent;
 import net.neoforged.neoforge.event.AnvilUpdateEvent;
 import net.neoforged.neoforge.event.RegisterGameTestsEvent;
+import net.neoforged.neoforge.event.entity.EntityAttributeModificationEvent;
+import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
 import net.neoforged.neoforge.event.village.VillagerTradesEvent;
@@ -174,6 +179,19 @@ public MI(IEventBus modBus, Dist dist) {
             }
         });
 
+        modBus.addListener(EntityAttributeModificationEvent.class, event -> {
+            for (EntityType<? extends LivingEntity> entityType : event.getTypes()) {
+                event.add(entityType, MIRegistries.QUANTUM_ARMOR);
+                event.add(entityType, MIRegistries.INFINITE_DAMAGE);
+            }
+        });
+        NeoForge.EVENT_BUS.addListener(LivingIncomingDamageEvent.class, event -> {
+            if (event.getSource().getDirectEntity() instanceof LivingEntity damager
+                    && damager.getAttributeValue(MIRegistries.INFINITE_DAMAGE) > Mth.EPSILON) {
+                event.setAmount((float) Integer.MAX_VALUE);
+            }
+        });
+
         modBus.addListener(FMLCommonSetupEvent.class, event -> {
             MIBlock.BLOCK_DEFINITIONS.values().forEach(BlockDefinition::onRegister);
             MIItem.ITEM_DEFINITIONS.values().forEach(ItemDefinition::onRegister);

src/main/java/aztech/modern_industrialization/MIRegistries.java

@@ -23,6 +23,8 @@
  */
 package aztech.modern_industrialization;
 
+import aztech.modern_industrialization.attributes.InfiniteDamageAttribute;
+import aztech.modern_industrialization.attributes.QuantumArmorAttribute;
 import aztech.modern_industrialization.blocks.creativestorageunit.CreativeStorageUnitBlockEntity;
 import aztech.modern_industrialization.blocks.forgehammer.ForgeHammerRecipe;
 import aztech.modern_industrialization.blocks.forgehammer.ForgeHammerScreenHandler;
@@ -39,6 +41,7 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.world.entity.npc.VillagerProfession;
 import net.minecraft.world.flag.FeatureFlags;
@@ -135,6 +138,13 @@ public class MIRegistries {
                 SoundEvents.VILLAGER_WORK_TOOLSMITH);
     });
 
+    // Attributes
+    public static final DeferredRegister<Attribute> ATTRIBUTES = DeferredRegister.create(Registries.ATTRIBUTE, MI.ID);
+
+    public static final Holder<Attribute> QUANTUM_ARMOR = ATTRIBUTES.register("quantum_armor", () -> new QuantumArmorAttribute().setSyncable(true));
+    public static final Holder<Attribute> INFINITE_DAMAGE = ATTRIBUTES.register("infinite_damage",
+            () -> new InfiniteDamageAttribute().setSyncable(true));
+
     static void init(IEventBus modBus) {
         BLOCK_ENTITIES.register(modBus);
         CONDITIONS.register(modBus);
@@ -144,5 +154,6 @@ static void init(IEventBus modBus) {
         RECIPE_TYPES.register(modBus);
         TABS.register(modBus);
         VILLAGER_PROFESSIONS.register(modBus);
+        ATTRIBUTES.register(modBus);
     }
 }

src/main/java/aztech/modern_industrialization/MIText.java

@@ -45,8 +45,9 @@ public enum MIText {
     AcceptsSteam("Accepts Steam (1 mb = 1 EU)"),
     AcceptsSteamToo("Also Accepts Steam (1 mb = 1 EU)"),
     AcceptsUpgrades("Add upgrades to increase max processing EU/t."),
-    AllowCreativeFlight("Allow Creative Flight"),
     Activated("Activated"),
+    AttributeInfiniteDamage("Infinite Damage"),
+    AttributeQuantumArmor("Quantum Armor"),
     BarrelStack("Can store up to %d stacks"),
     BarrelStorageComponent("%s / %s (%s)"),
     BaseDurationSeconds("%s sec"),

src/main/java/aztech/modern_industrialization/attributes/DisplayNamedAttribute.java

@@ -0,0 +1,63 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 Azercoco & Technici4n
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package aztech.modern_industrialization.attributes;
+
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.world.entity.ai.attributes.Attribute;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.item.TooltipFlag;
+
+public abstract class DisplayNamedAttribute extends Attribute {
+    protected DisplayNamedAttribute(String descriptionId, double defaultValue) {
+        super(descriptionId, defaultValue);
+    }
+
+    /**
+     * Translation key to use in tooltips, thanks to our override of {@link #toComponent(AttributeModifier, TooltipFlag)}.
+     * {@link #getDescriptionId()} is still used in /attribute commands and other contexts.
+     */
+    public abstract String getTooltipDescriptionId();
+
+    /*
+     * The below methods is copied from IAttributeExtension and uses DisplayAttribute#getDisplayDescriptionId so that Attribute#getDescriptionId
+     * can return the MIText.AttributeQuantumArmor description id. This is desirable because when using the /attribute command it will display the
+     * attribute name as "Quantum Armor" instead of just "Armor" like it does when using "attribute.name.generic.armor" as the description id (or
+     * "Infinite Damage" instead of just "Damage" for the InfiniteDamageAttribute).
+     */
+
+    @Override
+    public MutableComponent toComponent(AttributeModifier modif, TooltipFlag flag) {
+        double value = modif.amount();
+        String key = value > 0 ? "neoforge.modifier.plus" : "neoforge.modifier.take";
+        ChatFormatting color = this.getStyle(value > 0);
+
+        Component attrDesc = Component.translatable(this.getTooltipDescriptionId());
+        Component valueComp = this.toValueComponent(modif.operation(), value, flag);
+        MutableComponent comp = Component.translatable(key, valueComp, attrDesc).withStyle(color);
+
+        return comp.append(this.getDebugInfo(modif, flag));
+    }
+}

src/main/java/aztech/modern_industrialization/attributes/InfiniteDamageAttribute.java

@@ -0,0 +1,73 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 Azercoco & Technici4n
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package aztech.modern_industrialization.attributes;
+
+import aztech.modern_industrialization.MIText;
+import aztech.modern_industrialization.items.tools.QuantumSword;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.item.TooltipFlag;
+
+public class InfiniteDamageAttribute extends DisplayNamedAttribute {
+    private static final String INFINITY = "\u221e";
+
+    public InfiniteDamageAttribute() {
+        super(MIText.AttributeInfiniteDamage.getTranslationKey(), 0);
+    }
+
+    // Allows a modifier with the base id to render green with the effective value.
+    // Other modifiers still render blue with the additional value.
+    @Override
+    public ResourceLocation getBaseId() {
+        return QuantumSword.BASE_INFINITE_DAMAGE;
+    }
+
+    @Override
+    public MutableComponent toValueComponent(AttributeModifier.Operation operation, double value, TooltipFlag flag) {
+        return Component.literal(INFINITY);
+    }
+
+    @Override
+    public MutableComponent toBaseComponent(double value, double entityBase, boolean merged, TooltipFlag flag) {
+        String stringValue = value > Mth.EPSILON ? INFINITY : FORMAT.format(0);
+        MutableComponent comp = Component.translatable("attribute.modifier.equals.0", stringValue,
+                Component.translatable(this.getTooltipDescriptionId()));
+        if (flag.isAdvanced() && !merged) {
+            Component debugInfo = Component.literal(" ")
+                    .append(Component.translatable("neoforge.attribute.debug.base", FORMAT.format(entityBase), FORMAT.format(value - entityBase))
+                            .withStyle(ChatFormatting.GRAY));
+            comp.append(debugInfo);
+        }
+        return comp;
+    }
+
+    @Override
+    public String getTooltipDescriptionId() {
+        return "attribute.name.generic.attack_damage";
+    }
+}

src/main/java/aztech/modern_industrialization/attributes/QuantumArmorAttribute.java

@@ -0,0 +1,46 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 Azercoco & Technici4n
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package aztech.modern_industrialization.attributes;
+
+import aztech.modern_industrialization.MIText;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.item.TooltipFlag;
+
+public class QuantumArmorAttribute extends DisplayNamedAttribute {
+    public QuantumArmorAttribute() {
+        super(MIText.AttributeQuantumArmor.getTranslationKey(), 0);
+    }
+
+    @Override
+    public MutableComponent toValueComponent(AttributeModifier.Operation operation, double value, TooltipFlag flag) {
+        return Component.literal("\u00B9\u2044\u2084 |\u221E> + \u00B3\u2044\u2084 |0>");
+    }
+
+    @Override
+    public String getTooltipDescriptionId() {
+        return "attribute.name.generic.armor";
+    }
+}

src/main/java/aztech/modern_industrialization/compat/rei/machines/SteamMode.java

@@ -26,7 +26,8 @@
 public enum SteamMode {
     STEAM_ONLY(true, false),
     ELECTRIC_ONLY(false, true),
-    BOTH(true, true);
+    BOTH(true, true),
+    NEITHER(false, false);
 
     public final boolean steam;
     public final boolean electric;