AstralTransRocketries/Squake
1
0
Fork 0
mirror of https://github.com/squeek502/Squake.git synced 2025-08-03 17:58:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

port to 1.19.4

Browse Source
This commit is contained in:
Zach Mehall 2023-04-04 13:50:56 -07:00
parent cebb96aada
commit 96424cbef2
6 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '0.12-SNAPSHOT' id 'fabric-loom' version '1.1-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }

8
gradle.properties
View File

@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
minecraft_version=1.18.2 minecraft_version=1.19.4
yarn_mappings=1.18.2+build.3 yarn_mappings=1.19.4+build.1
loader_version=0.14.6 loader_version=0.14.17
# Mod Properties # Mod Properties
maven_group = squeek.quakemovement maven_group = squeek.quakemovement
@ -13,4 +13,4 @@ archives_base_name = squake
# Dependencies # Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.53.0+1.18.2 fabric_version=0.75.3+1.19.4

12
java/squeek/quakemovement/KeyBindInitializer.java
View File

@ -3,8 +3,8 @@ package squeek.quakemovement;
import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry; import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.InputUtil;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
@ -12,20 +12,18 @@ import org.lwjgl.glfw.GLFW;
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public class KeyBindInitializer implements ClientModInitializer public class KeyBindInitializer implements ClientModInitializer
{ {
public static FabricKeyBinding ENABLE; public static KeyBinding ENABLE;
public static String CATEGORY = "fabric.mods." + ModInfo.MODID; public static String CATEGORY = "fabric.mods." + ModInfo.MODID;
@Override @Override
public void onInitializeClient() public void onInitializeClient()
{ {
KeyBindingRegistry.INSTANCE.addCategory(CATEGORY);
ENABLE = registerKey("enable", GLFW.GLFW_KEY_UNKNOWN, CATEGORY); ENABLE = registerKey("enable", GLFW.GLFW_KEY_UNKNOWN, CATEGORY);
} }
public static FabricKeyBinding registerKey(String name, Integer code, String category) public static KeyBinding registerKey(String name, Integer code, String category)
{ {
FabricKeyBinding key = FabricKeyBinding.Builder.create(new Identifier(ModInfo.MODID, name), InputUtil.Type.KEYSYM, code, category).build(); KeyBinding key = KeyBindingHelper.registerKeyBinding(new KeyBinding(new Identifier(ModInfo.MODID, name).toTranslationKey(), InputUtil.Type.KEYSYM, code, category));
KeyBindingRegistry.INSTANCE.register(key);
return key; return key;
} }

11
java/squeek/quakemovement/QuakeClientPlayer.java
View File

@ -12,9 +12,8 @@ import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.FluidState; import net.minecraft.fluid.FluidState;
import net.minecraft.particle.BlockStateParticleEffect; import net.minecraft.particle.BlockStateParticleEffect;
import net.minecraft.particle.ParticleTypes; import net.minecraft.particle.ParticleTypes;
import net.minecraft.tag.FluidTags; import net.minecraft.registry.tag.FluidTags;
import net.minecraft.tag.Tag; import net.minecraft.registry.tag.TagKey;
import net.minecraft.tag.TagKey;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Box; import net.minecraft.util.math.Box;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
@ -136,7 +135,7 @@ public class QuakeClientPlayer
private static Block getGroundBlock(PlayerEntity player) private static Block getGroundBlock(PlayerEntity player)
{ {
// copied from Entity.getVelocityAffectingPos // copied from Entity.getVelocityAffectingPos
BlockPos groundPos = new BlockPos(player.getX(), player.getBoundingBox().minY - 0.5000001D, player.getZ()); BlockPos groundPos = new BlockPos((int) player.getX(), (int) (player.getBoundingBox().minY - 0.5000001D), (int) player.getZ());
return player.world.getBlockState(groundPos).getBlock(); return player.world.getBlockState(groundPos).getBlock();
} }
@ -287,7 +286,7 @@ public class QuakeClientPlayer
private static void minecraft_SwingLimbsBasedOnMovement(PlayerEntity player) private static void minecraft_SwingLimbsBasedOnMovement(PlayerEntity player)
{ {
// this got extracted out in the Minecraft code, so just use that // this got extracted out in the Minecraft code, so just use that
player.updateLimbs(player, false); player.updateLimbs(false);
} }
private static void minecraft_WaterMove(PlayerEntity player, Vec3d movementInput) private static void minecraft_WaterMove(PlayerEntity player, Vec3d movementInput)
@ -563,7 +562,7 @@ public class QuakeClientPlayer
// get all relevant movement values // get all relevant movement values
float wishspeed = (sidemove != 0.0F || forwardmove != 0.0F) ? quake_getMaxMoveSpeed(player) : 0.0F; float wishspeed = (sidemove != 0.0F || forwardmove != 0.0F) ? quake_getMaxMoveSpeed(player) : 0.0F;
double[] wishdir = getMovementDirection(player, sidemove, forwardmove); double[] wishdir = getMovementDirection(player, sidemove, forwardmove);
boolean isOffsetInLiquid = player.world.getBlockState(new BlockPos(player.getX(), player.getY() + 1.0D, player.getZ())).getFluidState().isEmpty(); boolean isOffsetInLiquid = player.world.getBlockState(new BlockPos((int) player.getX(), (int) (player.getY() + 1.0D), (int) player.getZ())).getFluidState().isEmpty();
boolean isSharking = isJumping(player) && isOffsetInLiquid; boolean isSharking = isJumping(player) && isOffsetInLiquid;
double curspeed = getSpeed(player); double curspeed = getSpeed(player);

3
java/squeek/quakemovement/mixin/KeyPressMixin.java
View File

@ -2,6 +2,7 @@ package squeek.quakemovement.mixin;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.resource.language.I18n; import net.minecraft.client.resource.language.I18n;
import net.minecraft.text.Text;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@ -21,7 +22,7 @@ public class KeyPressMixin
ModConfig.ENABLED = !ModConfig.ENABLED; ModConfig.ENABLED = !ModConfig.ENABLED;
String feedback = ModConfig.ENABLED ? I18n.translate("squake.key.toggle.enabled") : I18n.translate("squake.key.toggle.disabled"); String feedback = ModConfig.ENABLED ? I18n.translate("squake.key.toggle.enabled") : I18n.translate("squake.key.toggle.disabled");
MinecraftClient.getInstance().player.sendChatMessage("[" + ModInfo.MODID + "] " + feedback); MinecraftClient.getInstance().player.sendMessage(Text.of("[" + ModInfo.MODID + "] " + feedback));
} }
} }
} }

3
resources/fabric.mod.json
View File

@ -29,6 +29,7 @@
], ],
"depends": { "depends": {
"fabricloader": ">=0.4.0" "fabricloader": ">=0.14.17",
"minecraft": "~1.19.4"
} }
} }