Changelog.md

@@ -1,7 +1,5 @@
 # Upcoming changes
 
-Show battling Entities next to their attack button in the BattleGUI.
-
 # Version Forge-1.26.1
 
 Minor fixes/refactorings that should make the mod more robust.

README.md

@@ -73,7 +73,7 @@ configured for them.)
 
 Simply invoke `./gradlew build` in the mod directory and after some time the
 finished jar will be saved at
-`build/libs/TurnBasedMinecraft-Forge-1.26.2-all.jar`
+`build/libs/TurnBasedMinecraft-Forge-1.26.1-all.jar`
 
 # Reproducibility
 

gradle.properties

@@ -48,7 +48,7 @@ mod_name=TurnBasedMinecraftMod
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=1.26.2
+mod_version=1.26.1
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/com/burnedkirby/TurnBasedMinecraft/client/BattleGui.java

@@ -10,9 +10,7 @@ import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractButton;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.inventory.InventoryScreen;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraftforge.network.PacketDistributor;
 
 import java.util.ConcurrentModificationException;
@@ -31,7 +29,6 @@ public class BattleGui extends Screen {
 	private boolean stateChanged;
 	private String info;
 	private Long waitMissingBattleTicks;
-	private boolean showingEntities;
 
 	private enum MenuState {
 		MAIN_MENU(0), ATTACK_TARGET(1), ITEM_ACTION(2), WAITING(3), SWITCH_ITEM(4), USE_ITEM(5);
@@ -96,7 +93,6 @@ public class BattleGui extends Screen {
 		state = MenuState.MAIN_MENU;
 		stateChanged = true;
 		waitMissingBattleTicks = null;
-		showingEntities = false;
 	}
 
 	private void setState(MenuState state) {
@@ -131,7 +127,6 @@ public class BattleGui extends Screen {
 		}
 
 		stateChanged = false;
-		showingEntities = false;
 		clearWidgets();
 		switch (state) {
 		case MAIN_MENU:
@@ -152,7 +147,6 @@ public class BattleGui extends Screen {
 		case ATTACK_TARGET:
 			info = "Who will you attack?";
 			int y = 30;
-			showingEntities = true;
 			try {
 				for (Map.Entry<Integer, Combatant> e : TurnBasedMinecraftMod.proxy.getLocalBattle()
 						.getSideAEntrySet()) {
@@ -268,26 +262,6 @@ public class BattleGui extends Screen {
 		}
 
 		updateState();
-		if (showingEntities) {
-			int y = 30;
-			try {
-				for (Map.Entry<Integer, Combatant> e : TurnBasedMinecraftMod.proxy.getLocalBattle().getSideAEntrySet()) {
-					if (e.getValue().entity instanceof LivingEntity lEntity) {
-						InventoryScreen.renderEntityInInventoryFollowsMouse(guiGraphics, width / 4 - 60 - 20, y, width / 4 - 60, y + 20, 7, 0.0F, mouseX, mouseY, lEntity);
-					}
-					y += 20;
-				}
-			} catch(ConcurrentModificationException e) {}
-			y = 30;
-			try {
-				for (Map.Entry<Integer, Combatant> e : TurnBasedMinecraftMod.proxy.getLocalBattle().getSideBEntrySet()) {
-					if (e.getValue().entity instanceof LivingEntity lEntity) {
-						InventoryScreen.renderEntityInInventoryFollowsMouse(guiGraphics, width * 3 / 4 - 60 + 120, y, width * 3 / 4 - 60 + 140, y + 20, 7, 0.0F, mouseX, mouseY, lEntity);
-					}
-					y += 20;
-				}
-			} catch(ConcurrentModificationException e) {}
-		}
 
 		super.render(guiGraphics, mouseX, mouseY, partialTicks);
 

src/main/java/com/burnedkirby/TurnBasedMinecraft/common/TurnBasedMinecraftMod.java

@@ -39,7 +39,7 @@ import org.apache.logging.log4j.Logger;
 public class TurnBasedMinecraftMod {
     public static final String MODID = "com_burnedkirby_turnbasedminecraft";
     public static final String NAME = "Turn Based Minecraft Mod";
-    public static final String VERSION = "1.26.2";
+    public static final String VERSION = "1.26.1";
     public static final String CONFIG_FILENAME = "TBM_Config.toml";
     public static final String DEFAULT_CONFIG_FILENAME = "TBM_Config_DEFAULT.toml";
     public static final String CONFIG_DIRECTORY = "config/TurnBasedMinecraft/";