Compare commits

..

31 commits

Author SHA1 Message Date
02556bc43f Fix typo in README.md 2024-11-05 20:29:15 +09:00
7d10f38daf Update README.md 2024-11-05 18:07:55 +09:00
cc00257f36 Update FAQ.md 2024-11-05 17:53:12 +09:00
c8e43a58e0 Update update.json 2024-11-05 17:42:34 +09:00
2173b6ef6e Update Reproducibility.md 2024-11-05 17:39:05 +09:00
bd51eb7621 Update Changelog.md
All checks were successful
Build TurnBasedMC and create Release / check-release-exists (push) Successful in 1s
Build TurnBasedMC and create Release / build-and-create-release (push) Successful in 1m47s
2024-11-05 17:21:53 +09:00
e8bd28848a Bump to version 1.26.5, NeoForge 21.3.11-beta 2024-11-05 17:18:44 +09:00
dfeb368222 Change Config to add new entries in-place
Now, if changes are added to the default Config, they should be appended
to the existing config file instead of replacing it. All missing values
will be populated with defaults as well.
2024-11-05 17:18:44 +09:00
d62ae7be34 Update Changelog.md 2024-11-01 16:26:32 +09:00
420a5f120b Update ClientConfigGui to quit to "parentScreen" 2024-11-01 16:25:04 +09:00
f9cb3c0537 Add haste_speed and slow_speed to entity config 2024-11-01 15:35:49 +09:00
0cd721fa71 Update Changelog.md 2024-11-01 15:15:05 +09:00
fbbc208ec5 Update update.json 2024-11-01 14:41:29 +09:00
48ee3dd350 Update Reproducibility.md 2024-11-01 14:27:02 +09:00
9b82e1a5a4 Fix erronous double-line of code
All checks were successful
Build TurnBasedMC and create Release / check-release-exists (push) Successful in 1s
Build TurnBasedMC and create Release / build-and-create-release (push) Successful in 1m43s
2024-11-01 14:13:07 +09:00
2840445bfc Update Changelog.md 2024-11-01 14:12:11 +09:00
ecf52cd253 Allow Players to have "attack effect" 2024-11-01 13:11:02 +09:00
f6156bdc50 Bump version to 1.26.4 2024-10-31 15:48:04 +09:00
8c94e959d3 Update to NeoForge version 21.3.6-beta 2024-10-31 15:48:04 +09:00
ae6af86e7b 2/2 Player-specific TBMM battle config
Add support for custom stats per-player by player username.
2024-10-31 15:48:04 +09:00
d33686aaf9 1/2 Player-specific TBMM battle config
Add support for custom stats per-player by player username.
2024-10-31 15:48:04 +09:00
52d13f9e80 Update README.md 2024-10-29 19:18:10 +09:00
9a6f6de8f8 Update README.md 2024-10-29 17:59:08 +09:00
19f422a371 Update Reproducibility.md 2024-10-25 16:14:17 +09:00
1f066bfc3f Update update.json 2024-10-25 16:09:46 +09:00
7dd906ef8f Update Changelog.md 2024-10-25 15:49:22 +09:00
7d99ffc1f4 Update Changelog.md
All checks were successful
Build TurnBasedMC and create Release / check-release-exists (push) Successful in 1s
Build TurnBasedMC and create Release / build-and-create-release (push) Successful in 3m15s
2024-10-25 15:36:46 +09:00
e430c38ac8 Update Changelog.md 2024-10-25 15:27:46 +09:00
570c68c675 Minor refactoring
Do not create Battle instance client-side from received "Ping" packet.
2024-10-25 15:24:19 +09:00
2eea03730b Update Changelog.md 2024-10-25 15:24:19 +09:00
b9fd70c8da Port to NeoForge 21.3.2-beta (MC 1.21.3) 2024-10-25 15:24:19 +09:00
6 changed files with 19 additions and 11 deletions

View file

@ -82,7 +82,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-NeoForge-1.26.5-MC-1.21.1-all.jar`
`build/libs/TurnBasedMinecraft-NeoForge-1.26.5-all.jar`
# Reproducibility

View file

@ -13,17 +13,17 @@ parchment_mappings_version=2024.07.28
# Environment Properties
# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
# The Minecraft version must agree with the Neo version to get a valid artifact
minecraft_version=1.21.1
minecraft_version=1.21.3
# The Minecraft version range can use any release version of Minecraft as bounds.
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
# as they do not follow standard versioning conventions.
minecraft_version_range=[1.21.1, 1.22)
minecraft_version_range=[1.21.3, 1.22)
# The Neo version must agree with the Minecraft version to get a valid artifact
neo_version=21.1.74
neo_version=21.3.11-beta
# The Neo version range can use any version of Neo as bounds
neo_version_range=[21.1.0,)
neo_version_range=[21.3.0,)
# The loader version range can only use the major version of FML as bounds
loader_version_range=[4,)
@ -37,7 +37,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.5-MC-1.21.1
mod_version=1.26.5
# 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

View file

@ -168,7 +168,7 @@ public class ClientProxy extends CommonProxy {
parentComponent.getSiblings().add(prefix);
parentComponent.getSiblings().add(text);
// UUID is required by sendMessage, but appears to be unused, so just give dummy UUID
Minecraft.getInstance().player.sendSystemMessage(parentComponent);
Minecraft.getInstance().player.displayClientMessage(parentComponent, false);
}
@Override
@ -181,7 +181,7 @@ public class ClientProxy extends CommonProxy {
parentComponent.getSiblings().add(prefix);
parentComponent.getSiblings().add(text);
// UUID is required by sendMessage, but appears to be unused, so just give dummy UUID
Minecraft.getInstance().player.sendSystemMessage(parentComponent);
Minecraft.getInstance().player.displayClientMessage(parentComponent, false);
}
private void checkBattleTypes(boolean entityLeft) {

View file

@ -6,6 +6,7 @@ import com.burnedkirby.TurnBasedMinecraft.common.networking.PacketBattlePing;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
@ -1225,7 +1226,13 @@ public class Battle {
final int nextItemToUse = next.itemToUse;
final int prevItem = ((Player)nextEntity).getInventory().selected;
((Player)nextEntity).getInventory().selected = nextItemToUse;
((Player)nextEntity).getInventory().setItem(nextItemToUse, targetItem.use(nextEntity.level(), (Player)nextEntity, InteractionHand.MAIN_HAND).getObject());
InteractionResult interactionResult = targetItem.use(nextEntity.level(), (Player)nextEntity, InteractionHand.MAIN_HAND);
if (interactionResult instanceof InteractionResult.Success resultSuccess) {
ItemStack transformed = resultSuccess.heldItemTransformedTo();
if (transformed != null) {
((Player) nextEntity).getInventory().setItem(nextItemToUse, transformed);
}
}
((Player)nextEntity).getInventory().selected = prevItem;
}
}

View file

@ -41,7 +41,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.5-MC-1.21.1";
public static final String VERSION = "1.26.5";
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/";

View file

@ -1,5 +1,6 @@
package com.burnedkirby.TurnBasedMinecraft.common;
import net.minecraft.core.component.DataComponents;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
@ -68,6 +69,6 @@ public class Utility
}
public static boolean isItemEdible(ItemStack itemStack, @Nullable LivingEntity entity) {
return itemStack.getFoodProperties(entity) != null;
return itemStack.get(DataComponents.CONSUMABLE) != null;
}
}