6 Commits

Author SHA1 Message Date
5dcf4fc221 Update src/client/java/dev/tggamesyt/szar/client/mixin/MouseFlipMixin.java
All checks were successful
Build Minecraft Mod / build (push) Successful in 4m8s
Build Minecraft Mod / release (push) Successful in 20s
2026-04-01 11:09:28 +00:00
34b8fccf24 april
Some checks failed
Build Minecraft Mod / build (push) Failing after 2m35s
Build Minecraft Mod / release (push) Has been skipped
2026-04-01 09:24:48 +02:00
62ad19516b Trying to fix the issue where it gives a lot of files instead of one. #2
All checks were successful
Build Minecraft Mod / build (push) Successful in 3m55s
Build Minecraft Mod / release (push) Successful in 17s
2026-03-31 16:41:54 +00:00
c3eb514db7 Trying to fix the issue where it gives a lot of files instead of one.
All checks were successful
Build Minecraft Mod / build (push) Successful in 3m58s
Build Minecraft Mod / release (push) Successful in 18s
2026-03-31 16:35:13 +00:00
4bc0779967 Update .gitea/workflows/build.yml
All checks were successful
Build Minecraft Mod / build (push) Successful in 3m57s
Build Minecraft Mod / release (push) Successful in 18s
2026-03-31 16:28:12 +00:00
ab32bc230e fahhh
Some checks failed
Build Minecraft Mod / build (push) Successful in 4m26s
Build Minecraft Mod / release (push) Failing after 17s
2026-03-31 17:11:41 +02:00
10 changed files with 150 additions and 13 deletions

View File

@@ -87,7 +87,7 @@ jobs:
echo "Failed to read mod info" echo "Failed to read mod info"
exit 1 exit 1
fi fi
JAR="build/libs/${NAME}-${VERSION}.jar" JAR="${NAME}-${VERSION}.jar"
echo "NAME=$NAME" >> $GITEA_ENV echo "NAME=$NAME" >> $GITEA_ENV
echo "VERSION=$VERSION" >> $GITEA_ENV echo "VERSION=$VERSION" >> $GITEA_ENV
echo "JAR=$JAR" >> $GITEA_ENV echo "JAR=$JAR" >> $GITEA_ENV
@@ -131,13 +131,18 @@ jobs:
- name: Upload the mod JAR - name: Upload the mod JAR
run: | run: |
if [ ! -f "$JAR" ]; then # Find the largest JAR file (the main mod file is 120 MiB, others are KiB)
echo "Error: JAR not found: $JAR" JAR_FILE=$(ls -S ./release-artifacts/*.jar | head -n 1)
if [ ! -f "$JAR_FILE" ]; then
echo "Error: Main JAR not found in ./release-artifacts/"
exit 1 exit 1
fi fi
echo "Uploading largest file: $(basename $JAR_FILE)"
curl -X POST \ curl -X POST \
-H "Authorization: token ${{ secrets.GITEATOKEN }}" \ -H "Authorization: token ${{ secrets.GITEATOKEN }}" \
-H "Content-Type: application/java-archive" \ -H "Content-Type: application/java-archive" \
--data-binary @"$JAR" \ --data-binary @"$JAR_FILE" \
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets?name=$(basename $JAR)" "${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/${RELEASE_ID}/assets?name=$(basename $JAR_FILE)"

View File

@@ -6,7 +6,7 @@ minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10 yarn_mappings=1.20.1+build.10
loader_version=0.18.3 loader_version=0.18.3
# Mod Properties # Mod Properties
mod_version=26.3.30 mod_version=26.4.1
maven_group=dev.tggamesyt maven_group=dev.tggamesyt
archives_base_name=szar archives_base_name=szar
# Dependencies # Dependencies

View File

@@ -58,7 +58,34 @@ public class SzarClient implements ClientModInitializer {
// add this field to your client init class // add this field to your client init class
public static final int april = Szar.april; public static final int april = Szar.april;
public static final int fools = Szar.fools; public static final int fools = Szar.fools;
public static boolean hasBeaten = false;
// Transition state
public static long transitionStartTime = -1L;
public static boolean transitioningToNormal = false; // true = flipped->normal, false = normal->flipped
public static boolean wasFlipped = false;
public static final long TRANSITION_DURATION_MS = 2000L;
private float drogOverlayProgress = 0.0F; private float drogOverlayProgress = 0.0F;
public static float getCurrentFlipAngle() {
if (transitionStartTime != -1L) {
long elapsed = System.currentTimeMillis() - transitionStartTime;
if (elapsed >= TRANSITION_DURATION_MS) {
transitionStartTime = -1L;
wasFlipped = false;
return hasBeaten ? 0f : 180f;
}
float t = (float) elapsed / (float) TRANSITION_DURATION_MS;
t = t * t * (3f - 2f * t);
if (transitioningToNormal) {
return 180f * (1f - t); // 180 -> 0
} else {
return 180f * t; // 0 -> 180
}
}
return hasBeaten ? 0f : 180f;
}
private long lastTime = 0; private long lastTime = 0;
private static final Map<KeyBinding, KeyBinding> activeScramble = new HashMap<>(); private static final Map<KeyBinding, KeyBinding> activeScramble = new HashMap<>();
public static final EntityModelLayer PLANE = public static final EntityModelLayer PLANE =
@@ -90,6 +117,22 @@ public class SzarClient implements ClientModInitializer {
); );
@Override @Override
public void onInitializeClient() { public void onInitializeClient() {
ClientPlayNetworking.registerGlobalReceiver(Szar.APRIL_GAME_BEATEN, (client, handler, buf, responseSender) -> {
client.execute(() -> {
hasBeaten = true;
transitionStartTime = System.currentTimeMillis();
transitioningToNormal = true;
});
});
ClientPlayNetworking.registerGlobalReceiver(Szar.APRIL_GAME_BEATEN_REVOKED, (client, handler, buf, responseSender) -> {
client.execute(() -> {
hasBeaten = false;
transitionStartTime = System.currentTimeMillis();
transitioningToNormal = false;
wasFlipped = true;
});
});
BlockEntityRendererFactories.register(BlueprintBlocks.BLUEPRINT_STAIRS_BE_TYPE, BlueprintBlockEntityRenderer::new); BlockEntityRendererFactories.register(BlueprintBlocks.BLUEPRINT_STAIRS_BE_TYPE, BlueprintBlockEntityRenderer::new);
BlockEntityRendererFactories.register(BlueprintBlocks.BLUEPRINT_SLAB_BE_TYPE, BlueprintBlockEntityRenderer::new); BlockEntityRendererFactories.register(BlueprintBlocks.BLUEPRINT_SLAB_BE_TYPE, BlueprintBlockEntityRenderer::new);
BlockEntityRendererFactories.register(BlueprintBlocks.BLUEPRINT_DOOR_BE_TYPE, BlueprintBlockEntityRenderer::new); BlockEntityRendererFactories.register(BlueprintBlocks.BLUEPRINT_DOOR_BE_TYPE, BlueprintBlockEntityRenderer::new);

View File

@@ -28,6 +28,8 @@ public class MouseFlipMixin {
) )
private double flipMouseY(double pitchDelta) { private double flipMouseY(double pitchDelta) {
if (!isAprilFools()) return pitchDelta; if (!isAprilFools()) return pitchDelta;
return -pitchDelta; // Flip mouse when angle is past 90 degrees (i.e. screen is more flipped than not)
if (SzarClient.getCurrentFlipAngle() > 90f) return -pitchDelta;
return pitchDelta;
} }
} }

View File

@@ -26,20 +26,27 @@ public class ScreenFlipMixin {
@ModifyReturnValue(method = "getBasicProjectionMatrix", at = @At("RETURN")) @ModifyReturnValue(method = "getBasicProjectionMatrix", at = @At("RETURN"))
private Matrix4f flipProjection(Matrix4f original) { private Matrix4f flipProjection(Matrix4f original) {
if (!isAprilFools()) return original; if (!isAprilFools()) return original;
return original.scale(1.0f, -1.0f, 1.0f);
float angle = SzarClient.getCurrentFlipAngle();
if (angle == 0f) return original;
if (angle == 180f) return original.scale(1.0f, -1.0f, 1.0f);
return original.rotateZ((float) Math.toRadians(angle));
} }
@Inject(method = "renderWorld", at = @At("HEAD")) @Inject(method = "renderWorld", at = @At("HEAD"))
private void setFrontFaceCW(float tickDelta, long limitTime, MatrixStack matrices, CallbackInfo ci) { private void setFrontFaceCW(float tickDelta, long limitTime, MatrixStack matrices, CallbackInfo ci) {
if (!isAprilFools()) return; if (!isAprilFools()) return;
// Y flip reverses winding order, so tell GL that clockwise = front face if (SzarClient.getCurrentFlipAngle() > 90f) {
GL11.glFrontFace(GL11.GL_CW); GL11.glFrontFace(GL11.GL_CW);
}
} }
@Inject(method = "renderWorld", at = @At("TAIL")) @Inject(method = "renderWorld", at = @At("TAIL"))
private void restoreFrontFaceCCW(float tickDelta, long limitTime, MatrixStack matrices, CallbackInfo ci) { private void restoreFrontFaceCCW(float tickDelta, long limitTime, MatrixStack matrices, CallbackInfo ci) {
if (!isAprilFools()) return; if (!isAprilFools()) return;
// Restore default: counter-clockwise = front face if (SzarClient.getCurrentFlipAngle() > 90f) {
GL11.glFrontFace(GL11.GL_CCW); GL11.glFrontFace(GL11.GL_CCW);
}
} }
} }

View File

@@ -103,6 +103,8 @@ public class Szar implements ModInitializer {
public static final Logger LOGGER = LogManager.getLogger(MOD_ID); public static final Logger LOGGER = LogManager.getLogger(MOD_ID);
public static int april = 4; public static int april = 4;
public static int fools = 1; public static int fools = 1;
public static final Identifier APRIL_GAME_BEATEN = new Identifier(MOD_ID, "april_game_beaten");
public static final Identifier APRIL_GAME_BEATEN_REVOKED = new Identifier("szar", "april_game_beaten_revoked");
public static final Identifier DRUNK_TYPE_PACKET = new Identifier(MOD_ID, "drunk_type"); public static final Identifier DRUNK_TYPE_PACKET = new Identifier(MOD_ID, "drunk_type");
public static final Identifier OPEN_DETONATOR_SCREEN = new Identifier(MOD_ID, "open_coord_screen"); public static final Identifier OPEN_DETONATOR_SCREEN = new Identifier(MOD_ID, "open_coord_screen");
public static final Identifier DETONATOR_INPUT = new Identifier(MOD_ID, "coord_input"); public static final Identifier DETONATOR_INPUT = new Identifier(MOD_ID, "coord_input");

View File

@@ -0,0 +1,56 @@
package dev.tggamesyt.szar.mixin;
import dev.tggamesyt.szar.Szar;
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.advancement.Advancement;
import net.minecraft.advancement.PlayerAdvancementTracker;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.Identifier;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.time.LocalDate;
@Mixin(PlayerAdvancementTracker.class)
public class PlayerAdvancementTrackerMixin {
@Shadow
private ServerPlayerEntity owner;
@Inject(method = "grantCriterion", at = @At("RETURN"))
private void onCriterionGranted(Advancement advancement, String criterionName, CallbackInfoReturnable<Boolean> cir) {
if (!cir.getReturnValue()) return;
if (owner == null) return;
if (advancement.getId().equals(new Identifier("end", "kill_dragon"))) {
if (!owner.getAdvancementTracker().getProgress(advancement).isDone()) return;
LocalDate today = LocalDate.now();
if (today.getMonthValue() != Szar.april || today.getDayOfMonth() != Szar.fools) return;
Szar.grantAdvancement(owner, "april_game_beaten");
return;
}
if (!advancement.getId().equals(new Identifier(Szar.MOD_ID, "april_game_beaten"))) return;
if (!owner.getAdvancementTracker().getProgress(advancement).isDone()) return;
ServerPlayNetworking.send(owner, Szar.APRIL_GAME_BEATEN, PacketByteBufs.empty());
}
@Inject(method = "revokeCriterion", at = @At("RETURN"))
private void onCriterionRevoked(Advancement advancement, String criterionName, CallbackInfoReturnable<Boolean> cir) {
if (!cir.getReturnValue()) return;
if (owner == null) return;
if (!advancement.getId().equals(new Identifier(Szar.MOD_ID, "april_game_beaten"))) return;
// If it's no longer done after revoking, send the revoke packet
if (owner.getAdvancementTracker().getProgress(advancement).isDone()) return;
ServerPlayNetworking.send(owner, Szar.APRIL_GAME_BEATEN_REVOKED, PacketByteBufs.empty());
}
}

View File

@@ -206,5 +206,8 @@
"block.szar.ender_obsidian": "Ender Obsidian", "block.szar.ender_obsidian": "Ender Obsidian",
"block.szar.ender_ore": "Ender Ore", "block.szar.ender_ore": "Ender Ore",
"item.szar.raw_ender": "Raw Ender", "item.szar.raw_ender": "Raw Ender",
"item.szar.ender_ingot": "Ender Ingot" "item.szar.ender_ingot": "Ender Ingot",
"advancement.szar.april_game_beaten.title": "We are so back",
"advancement.szar.april_game_beaten.description": "Beat the game on april 1st to flip the game back."
} }

View File

@@ -0,0 +1,18 @@
{
"parent": "szar:april",
"display": {
"icon": {
"item": "szar:april"
},
"title": {"translate": "advancement.szar.april_game_beaten.title"},
"description": {"translate": "advancement.szar.april_game_beaten.description"},
"show_toast": true,
"announce_to_chat": false,
"frame": "challenge"
},
"criteria": {
"used_item": {
"trigger": "minecraft:impossible"
}
}
}

View File

@@ -16,6 +16,7 @@
"NoClipMixin", "NoClipMixin",
"NoiseChunkGeneratorMixin", "NoiseChunkGeneratorMixin",
"PlaneBlockInteractionMixin", "PlaneBlockInteractionMixin",
"PlayerAdvancementTrackerMixin",
"PlayerDropMixin", "PlayerDropMixin",
"PlayerEntityMixin", "PlayerEntityMixin",
"PlayerInteractionMixin", "PlayerInteractionMixin",