Merge pull request #241 from SoLegendary/1.20.1-1.1.4

1.20.1 1.1.4

Author: SoLegendary

TODO.txt

@@ -1,5 +1,5 @@
 
-1.19.2-1.1.3a
+1.19.2-1.1.4
 
 [✔] Done and tested
 [🟡] Partially done and/or needs testing
@@ -8,19 +8,35 @@
 
 Features
 --------
-
+HEROES (in order of priority)
+    - spells
+    - spell animations
+    - spell particles
+    - levelling and exp
+        - exp bar/level number above portrait, below name
+    - spell levelling and requirements
+    - mana?
+    - equipment
 
 
 Bugfixes
 --------
-[✔] Fixed Pillagers not attacking
-[✔] Healing fountains now remove their water blocks when deleted
-[✔] Beacon win timers are now saved between server restarts
+[❌] Prevent superflat worlds generating regular worlds after a certain range
+[❌] Kicked for sending too many packets when spam clicking large army (rate-limit in server.properties?)
+
 
+Quality of Life
+---------------
 
 
 Balancing
 ---------
+- Nerf sculk amplifiers? (can reduce damage)
+- Nerf ravager artillery? (take away bonus damage?)
+- Buff creepers?
+- Give witches autocast and attack move
+    - Make AOE spherical instead of hemispherical
+    - Add antifire and healing potions with upgrades
 
 
 Villagers

TODO_backlog.txt

@@ -6,21 +6,16 @@
 Features
 --------
 
-[❌] Piglin mines
-    - Static defense for piglins, but can also be used to siege
-    - When built, can be exploded manaully (or set to autoexplode on nearby enemies approaching)
-    - Explodes into combination of soulsand and magma
+[❌] Import the Bedrock Minecraft Movie addon piglins
 
+[❌] Add basic controls for non-rts units (so you can control modded units)
 
+[❌] Config to allow changing resource block values, including modded blocks
 
 
 Bugfixes
 --------
 
-[❌] Workers on a building that is still auto-building the foundation layer actually slows down building
-
-[❌] Central portals sometimes do not ignite (and this somehow makes grunts spawn underground)
-
 [❌] Dying in survival puts you in a bugged survival mode
 
 [❌] Villagers with professions don't use the correct texture for their arms, esp. farmers
@@ -33,16 +28,16 @@ Quality of Life Features
 
 [❌] Added /gamerule for bridges over void
 
-[❌] Save transport portal links between server restarts
-
 [❌] restore ores on /rts-reset
     - Have to track each ore block when it is mined or converted into nether terrain
 
-
+[❌] buff/debuff icons in vertical list to right of unit stats
+    - potion effects
+    - auras
+    - hero passives
+    - enchantments
 
 Balancing
 ---------
 
 [❌] Soulfires created by blazes need to be made temporary
-
-[❌] let allied survival players use transport portals

build.gradle

@@ -19,7 +19,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'org.parchmentmc.librarian.forgegradle'
 
-version = '1.1.3a-1.20.1-beta'
+version = '1.1.4'
 group = 'com.solegendary.reignofnether' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'reignofnether'
 

src/main/java/com/solegendary/reignofnether/CommonModEvents.java

@@ -106,6 +106,9 @@ public static void registerRenderers(EntityRenderersEvent.RegisterRenderers evt)
         evt.registerEntityRenderer(EntityRegistrar.PANDA_UNIT.get(), PandaRenderer::new);
         evt.registerEntityRenderer(EntityRegistrar.WOLF_UNIT.get(), WolfRenderer::new);
         evt.registerEntityRenderer(EntityRegistrar.LLAMA_UNIT.get(), LlamaUnitRenderer::new);
+
+        evt.registerEntityRenderer(EntityRegistrar.PHANTOM_SUMMON.get(), PhantomRenderer::new);
+        evt.registerEntityRenderer(EntityRegistrar.KILLER_RABBIT_UNIT.get(), RabbitRenderer::new);
     }
 
     @SubscribeEvent
@@ -115,6 +118,7 @@ public static void registerAttributes(EntityAttributeCreationEvent evt) {
         evt.put(EntityRegistrar.PANDA_UNIT.get(), PandaUnit.createAttributes().build());
         evt.put(EntityRegistrar.WOLF_UNIT.get(), WolfUnit.createAttributes().build());
         evt.put(EntityRegistrar.LLAMA_UNIT.get(), WolfUnit.createAttributes().build());
+        evt.put(EntityRegistrar.PHANTOM_SUMMON.get(), PhantomSummon.createAttributes().build());
 
         evt.put(EntityRegistrar.ZOMBIE_UNIT.get(), ZombieUnit.createAttributes().build());
         evt.put(EntityRegistrar.ZOMBIE_PIGLIN_UNIT.get(), ZombiePiglinUnit.createAttributes().build());
@@ -150,7 +154,7 @@ public static void registerAttributes(EntityAttributeCreationEvent evt) {
         evt.put(EntityRegistrar.ROYAL_GUARD_UNIT.get(), RoyalGuardUnit.createAttributes().build());
         evt.put(EntityRegistrar.NECROMANCER_UNIT.get(), NecromancerUnit.createAttributes().build());
         evt.put(EntityRegistrar.PIGLIN_MERCHANT_UNIT.get(), PiglinMerchantUnit.createAttributes().build());
-
+        evt.put(EntityRegistrar.KILLER_RABBIT_UNIT.get(), KillerRabbitUnit.createAttributes().build());
     }
 
     @SubscribeEvent
@@ -214,7 +218,6 @@ public static void creativeTabSetup(BuildCreativeModeTabContentsEvent event) {
             event.accept(ItemRegistrar.ROYAL_GUARD_UNIT_SPAWN_EGG);
             event.accept(ItemRegistrar.NECROMANCER_UNIT_SPAWN_EGG);
             event.accept(ItemRegistrar.PIGLIN_MERCHANT_UNIT_SPAWN_EGG);
-
         }
     }
 }

src/main/java/com/solegendary/reignofnether/ReignOfNether.java

@@ -46,7 +46,7 @@
 public class ReignOfNether {
     public static final Logger LOGGER = LogManager.getLogger();
     public static final String MOD_ID = "reignofnether";
-    public static final String VERSION_STRING = "1.1.3a-1.20.1-beta";
+    public static final String VERSION_STRING = "1.1.4";
 
     // Fields from ClientReset
     public static final Field handshakeField;

src/main/java/com/solegendary/reignofnether/ability/Ability.java

@@ -15,7 +15,7 @@
 public class Ability {
     public final UnitAction action; // null for worker building production items (handled specially in BuildingClientEvents)
     public final Level level;
-    public final float cooldownMax;
+    public float cooldownMax;
     private float cooldown = 0;
     public final float range; // if <= 0, is melee
     public final float radius; // if <= 0, is single target

src/main/java/com/solegendary/reignofnether/ability/AbilityServerboundPacket.java

@@ -0,0 +1,57 @@
+package com.solegendary.reignofnether.ability;
+
+import com.solegendary.reignofnether.registrars.PacketHandler;
+import com.solegendary.reignofnether.unit.UnitAction;
+import com.solegendary.reignofnether.unit.UnitClientEvents;
+import com.solegendary.reignofnether.unit.UnitServerEvents;
+import com.solegendary.reignofnether.unit.interfaces.Unit;
+import com.solegendary.reignofnether.unit.packets.UnitActionServerboundPacket;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraftforge.network.NetworkEvent;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Supplier;
+
+public class AbilityServerboundPacket {
+
+    private final int unitId;
+    private final UnitAction unitAction;
+
+    public static void rankUpAbility(int unitId, UnitAction abilityAction) {
+        PacketHandler.INSTANCE.sendToServer(new AbilityServerboundPacket(unitId, abilityAction));
+    }
+
+    public AbilityServerboundPacket(
+        int unitId,
+        UnitAction unitAction
+    ) {
+        this.unitId = unitId;
+        this.unitAction = unitAction;
+    }
+
+    public AbilityServerboundPacket(FriendlyByteBuf buffer) {
+        this.unitId = buffer.readInt();
+        this.unitAction = buffer.readEnum(UnitAction.class);
+    }
+
+    public void encode(FriendlyByteBuf buffer) {
+        buffer.writeInt(this.unitId);
+        buffer.writeEnum(this.unitAction);
+    }
+
+    // server-side packet-consuming functions
+    public boolean handle(Supplier<NetworkEvent.Context> ctx) {
+        final var success = new AtomicBoolean(false);
+        ctx.get().enqueueWork(() -> {
+            success.set(true);
+            for (LivingEntity entity : UnitServerEvents.getAllUnits())
+                if (entity.getId() == this.unitId && entity instanceof Unit unit)
+                    for (Ability ability : unit.getAbilities())
+                        if (ability.action == this.unitAction && ability instanceof HeroAbility heroAbility)
+                            heroAbility.rankUp();
+        });
+        ctx.get().setPacketHandled(true);
+        return success.get();
+    }
+}

src/main/java/com/solegendary/reignofnether/ability/HeroAbility.java

@@ -0,0 +1,119 @@
+package com.solegendary.reignofnether.ability;
+
+import com.solegendary.reignofnether.ReignOfNether;
+import com.solegendary.reignofnether.hud.AbilityButton;
+import com.solegendary.reignofnether.hud.Button;
+import com.solegendary.reignofnether.keybinds.Keybinding;
+import com.solegendary.reignofnether.keybinds.Keybindings;
+import com.solegendary.reignofnether.unit.UnitAction;
+import com.solegendary.reignofnether.unit.interfaces.HeroUnit;
+import com.solegendary.reignofnether.unit.interfaces.Unit;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.Style;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FormattedCharSequence;
+import net.minecraft.world.entity.Entity;
+
+import java.util.List;
+
+import static com.solegendary.reignofnether.util.MiscUtil.fcs;
+
+public abstract class HeroAbility extends Ability {
+
+    // can be ranked up when the hero levels up
+    // requires a HeroUnit to be passed
+
+    public final HeroUnit hero;
+    public int rank = 0; // 0 == not learnt
+    public final int maxRank;
+
+    public HeroAbility(HeroUnit hero, int maxRank, UnitAction action, int cooldownMax, float range, float radius, boolean canTargetEntities) {
+        super(action, ((Entity) hero).level(), cooldownMax, range, radius, canTargetEntities);
+        this.hero = hero;
+        this.maxRank = maxRank;
+    }
+
+    public int getLevelRequirement() {
+        if (maxRank <= 1) {
+           return 6;
+        } else {
+            return (rank * 2) + 1;
+        }
+    }
+
+    public boolean rankUp() {
+        if (rank < maxRank && hero.getSkillPoints() > 0 && hero.getHeroLevel() >= getLevelRequirement()) {
+            rank += 1;
+            hero.setSkillPoints(hero.getSkillPoints() - 1);
+            return true;
+        }
+        return false;
+    }
+
+    protected String rankString() {
+        return rank > 0 ? I18n.get("abilities.reignofnether.rank", rank) : I18n.get("abilities.reignofnether.unlearnt");
+    }
+
+    public List<FormattedCharSequence> getRankUpTooltipLines() {
+        return List.of();
+    }
+
+    public List<FormattedCharSequence> getTooltipLines() {
+        return List.of();
+    }
+
+    public AbilityButton getButton(Keybinding hotkey) {
+        return null;
+    }
+
+    // rank up button for this specific ability
+    public Button getRankUpButton() {
+        return null;
+    }
+
+    protected Button getRankUpButtonProtected(String name, ResourceLocation resourceLocation) {
+        Button button = new Button(name,
+            14,
+            new ResourceLocation(ReignOfNether.MOD_ID, "textures/hud/level_up_skill.png"),
+            (Keybinding) null,
+            () -> false,
+            () -> !hero.isRankUpMenuOpen() || rank >= maxRank,
+            () -> hero.getSkillPoints() > 0 && hero.getHeroLevel() >= getLevelRequirement(),
+            () -> {
+                if (rankUp()) {
+                    AbilityServerboundPacket.rankUpAbility(((Entity) hero).getId(), action);
+                    ((Unit) hero).updateAbilityButtons();
+                }
+                if (hero.getSkillPoints() <= 0)
+                    hero.showRankUpMenu(false);
+            },
+            null,
+            getRankUpTooltipLines()
+        );
+        button.bgIconResource = resourceLocation;
+        return button;
+    }
+
+    // button that all heroes have to show ability level up options
+    public static Button getRankUpMenuButton(HeroUnit hero) {
+        Button menuButton = new Button("Rank up abilities",
+            14,
+            hero.isRankUpMenuOpen() ?
+                new ResourceLocation(ReignOfNether.MOD_ID, "textures/hud/cross.png") :
+                new ResourceLocation(ReignOfNether.MOD_ID, "textures/hud/tick.png"),
+            Keybindings.keyU,
+            () -> false,
+            () -> hero.getHeroLevel() >= HeroUnit.MAX_HERO_LEVEL && hero.getSkillPoints() <= 0,
+            () -> true,
+            () -> hero.showRankUpMenu(!hero.isRankUpMenuOpen()),
+            null,
+            List.of(fcs(I18n.get("abilities.reignofnether.rank_up_menu", hero.getSkillPoints()), true))
+        );
+        menuButton.isFlashing = () -> !hero.isRankUpMenuOpen() && hero.getSkillPoints() > 0;
+        return menuButton;
+    }
+
+    public Style getLevelReqStyle() {
+        return Style.EMPTY.withColor(hero.getHeroLevel() >= getLevelRequirement() ? 0x00FF00 : 0xFF0000);
+    }
+}