Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/matrix_includes.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
[
{
"subproject_dir": "26.1"
},
{
"subproject_dir": "26.1.1"
"subproject_dir": "26.1.2"
},
{
"subproject_dir": "26.1.2"
"subproject_dir": "26.2"
}
]
6 changes: 2 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ plugins {
preprocess {
preprocess.strictExtraMappings.set(false)

def mc260100 = createNode('26.1', 26_01_00, '')
def mc260101 = createNode('26.1.1', 26_01_01, '')
def mc260102 = createNode('26.1.2', 26_01_02, '')
def mc260200 = createNode('26.2', 26_02_00, '')

mc260100.link(mc260101, file('versions/mapping-26.1-26.1.1.txt'))
mc260101.link(mc260102, file('versions/mapping-26.1.1-26.1.2.txt'))
mc260102.link(mc260200, file('versions/mapping-26.1.2-26.2.txt'))
}

tasks.register('buildAndGather') {
Expand Down
11 changes: 11 additions & 0 deletions common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,17 @@ loom {
accessWidenerPath = file("fuzz.accesswidener")
}

afterEvaluate {
tasks.matching { it.name.startsWith('runMixinAudit') }.configureEach { runTask ->
parent.subprojects.findAll { it != project }.each { otherProject ->
def downloadAssets = otherProject.tasks.findByName('downloadAssets')
if (downloadAssets != null) {
runTask.mustRunAfter(downloadAssets)
}
}
}
}

JavaVersion JAVA_VERSION
if (mcVersion >= 260000) {
JAVA_VERSION = JavaVersion.VERSION_25
Expand Down
30 changes: 0 additions & 30 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,6 @@

---

## 版本支持

✔ 正在维护

✖ 停止维护

❓ 通常只修复BUG

| 游戏版本 | 开发状态 | 最后支持版本 |
|:--------------------:| :------: | :----------: |
| 26.1.1 | ✔ | --- |
| 26.1 | ✔ | --- |
| 1.21.11 | ✔ | --- |
| 1.21.10 | ✔ | --- |
| 1.21.9 | ✔ | --- |
| 1.21.8 | ✔ | --- |
| 1.21.7 | ✔ | --- |
| 1.21.6 | ✔ | --- |
| 1.21.5 | ✔ | --- |
| 1.21.4 | ✔ | --- |
| 1.21.3 | ✔ | --- |
| 1.21.2 | ✔ | --- |
| 1.21.1 | ✔ | --- |
| 1.21 | ✔ | --- |
| 1.20.6 | ✔ | --- |
| 1.19.4 | ✔ | --- |
| 1.18.2 | ✔ | --- |
| 1.17.1 | ✔ | --- |
| **<u>1.16.5(主)</u>** | ✔ | --- |

## 依赖
| 依赖 | 链接 | 要求 |
|:-------------------:|:-------------------------------------------------:|:--:|
Expand Down
30 changes: 0 additions & 30 deletions docs/en/development_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,6 @@

---

## Support Version

✔ Under maintenance

✖ Discontinued maintenance

❓ Usually only bug fixes

| Game Version | Development Status | Last Supported Version |
|:-------------------------:| :----------------: | :--------------------: |
| 26.1.1 | ✔ | --- |
| 26.1 | ✔ | --- |
| 1.21.11 | ✔ | --- |
| 1.21.10 | ✔ | --- |
| 1.21.9 | ✔ | --- |
| 1.21.8 | ✔ | --- |
| 1.21.7 | ✔ | --- |
| 1.21.6 | ✔ | --- |
| 1.21.5 | ✔ | --- |
| 1.21.4 | ✔ | --- |
| 1.21.3 | ✔ | --- |
| 1.21.2 | ✔ | --- |
| 1.21.1 | ✔ | --- |
| 1.21 | ✔ | --- |
| 1.20.6 | ✔ | --- |
| 1.19.4 | ✔ | --- |
| 1.18.2 | ✔ | --- |
| 1.17.1 | ✔ | --- |
| **<u>1.16.5(master)</u>** | ✔ | --- |

## Dependencies
| Dependency | Link | Requirements |
|:-------------------:|:-------------------------------------------------:|:------------:|
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx6G

# Fabric Properties
# check these on https://fabricmc.net/develop
loader_version = 0.18.4
loader_version = 0.19.3

# Mod Properties
mod_id = fuzz
mod_name = Fuzz
mod_version = 1.6.11
mod_version = 1.6.12
maven_group = top.1024byteeeee
archives_base_name = Fuzz

Expand All @@ -19,6 +19,6 @@ annotationtoolbox_version = 0.3
mixinextras_version = 0.5.2
# https://github.com/ReplayMod/preprocessor
preprocess_version = c5abb4fb12
fabric_loom_version = 1.15-SNAPSHOT
fabric_loom_version = 1.17-SNAPSHOT
hierynomus_license_version = 0.16.1
tiny_yaml_version = 1.0.3
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 2 additions & 3 deletions minecraftVersions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"versions": [
"26.1",
"26.1.1",
"26.1.2"
"26.1.2",
"26.2"
]
}
8 changes: 4 additions & 4 deletions run/options.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version:4790
version:4788
ao:true
biomeBlendRadius:2
chunkSectionFadeInTime:0.75
Expand Down Expand Up @@ -167,9 +167,9 @@ key_key.debug.profilingChart:key.keyboard.1
key_key.debug.fpsCharts:key.keyboard.2
key_key.debug.networkCharts:key.keyboard.3
key_key.debug.lightmapTexture:key.keyboard.4
key_quickKickFakePlayer:key.keyboard.unknown
key_quickDropFakePlayerAllItemStack:key.keyboard.unknown
key_Clear Coordinate Compass:key.keyboard.unknown
key_快捷踢出假人:key.keyboard.unknown
key_快捷扔出假人背包:key.keyboard.unknown
key_清除坐标罗盘:key.keyboard.unknown
soundCategory_master:0.24668874
soundCategory_music:0.0
soundCategory_record:1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ public HoneyBlockMixin(Properties settings) {

@Override
public float getSpeedFactor() {
return FuzzSettings.honeyBlockSlowDownDisabled ? Blocks.GRAY_CONCRETE.getSpeedFactor() : super.getSpeedFactor();
return FuzzSettings.honeyBlockSlowDownDisabled ? Blocks.TNT.getSpeedFactor() : super.getSpeedFactor();
}

@Override
public float getJumpFactor() {
return FuzzSettings.honeyBlockSlowDownDisabled ? Blocks.GRAY_CONCRETE.getJumpFactor() : super.getJumpFactor();
return FuzzSettings.honeyBlockSlowDownDisabled ? Blocks.TNT.getJumpFactor() : super.getJumpFactor();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public abstract class LivingEntityMixin {
private float iceSlipperinessDisabled(Block block, Operation<Float> original) {
LivingEntity entity = (LivingEntity) (Object) this;
if (FuzzSettings.iceSlipperinessDisabled && entity.equals(ClientUtil.getCurrentPlayer()) && IceFamily.isIce(block)) {
return Blocks.GRAY_CONCRETE.getFriction();
return Blocks.TNT.getFriction();
} else {
return original.call(block);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public abstract class LivingEntityMixin {
private float slimeSlipperinessDisabled(Block block, Operation<Float> original) {
LivingEntity entity = (LivingEntity) (Object) this;
if (FuzzSettings.slimeBlockSlowDownDisabled && entity.equals(ClientUtil.getCurrentPlayer()) && block.equals(Blocks.SLIME_BLOCK)) {
return Blocks.GRAY_CONCRETE.getFriction();
return Blocks.TNT.getFriction();
} else {
return original.call(block);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@

import org.spongepowered.asm.mixin.Mixin;

import top.byteeeee.annotationtoolbox.annotation.GameVersion;
import top.byteeeee.fuzz.FuzzSettings;
import top.byteeeee.fuzz.helpers.Noop;
import top.byteeeee.fuzz.utils.ClientUtil;

@GameVersion(version = "Minecraft < 26.2")
@Mixin(SlimeBlock.class)
public abstract class SlimeBlockMixin {
@WrapMethod(method = "bounceUp")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ public SoulSandBlockMixin(Properties settings) {

@Override
public float getSpeedFactor() {
return FuzzSettings.soulSandBlockSlowDownDisabled ? Blocks.GRAY_CONCRETE.getSpeedFactor() : super.getSpeedFactor();
return FuzzSettings.soulSandBlockSlowDownDisabled ? Blocks.TNT.getSpeedFactor() : super.getSpeedFactor();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ protected static void renderWorld(LevelRenderContext context) {
return;
}

//#if MC>=260200
//$$ Camera camera = client.gameRenderer.mainCamera();
//#else
Camera camera = client.gameRenderer.getMainCamera();
//#endif
PoseStack matrixStack = context.poseStack();
matrixStack.pushPose();
Vec3 cameraPos = camera.position();
Expand All @@ -95,13 +99,24 @@ protected static void renderWorld(LevelRenderContext context) {
matrixStack.mulPose(new Quaternionf().rotationYXZ((float)Math.toRadians(yaw), (float)Math.toRadians(pitch), 0));
float scale = 1.0F;
matrixStack.scale(scale, scale, scale);
//#if MC<260200
PoseStack.Pose entry = matrixStack.last();
//#endif
RenderType renderLayer = RenderTypes.textSeeThrough(TARGET_ICON);
//#if MC>=260200
//$$ context.submitNodeCollector().order(-1).submitCustomGeometry(context.poseStack(), renderLayer, (pose, buffer) -> {
//$$ buffer.addVertex(pose, -1F, -1F, 0F).setColor(1F, 1F, 1F, 1).setUv(0F, 0F);
//$$ buffer.addVertex(pose, -1F, 1F, 0F).setColor(1F, 1F, 1F, 1).setUv(0F, 1F);
//$$ buffer.addVertex(pose, 1F, 1F, 0F).setColor(1F, 1F, 1F, 1).setUv(1F, 1F);
//$$ buffer.addVertex(pose, 1F, -1F, 0F).setColor(1F, 1F, 1F, 1).setUv(1F, 0F);
//$$ });
//#else
VertexConsumer vertexConsumer = Objects.requireNonNull(context.bufferSource()).getBuffer(renderLayer);
vertexConsumer.addVertex(entry.pose(), -1F, -1F, 0F).setUv(0F, 0F).setColor(-1).setLight(0xF000F0);
vertexConsumer.addVertex(entry.pose(), -1F, 1F, 0F).setUv(0F, 1F).setColor(-1).setLight(0xF000F0);
vertexConsumer.addVertex(entry.pose(), 1F, 1F, 0F).setUv(1F, 1F).setColor(-1).setLight(0xF000F0);
vertexConsumer.addVertex(entry.pose(), 1F, -1F, 0F).setUv(1F, 0F).setColor(-1).setLight(0xF000F0);
//#endif
matrixStack.popPose();
}

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/top/byteeeee/fuzz/utils/MixinUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
package top.byteeeee.fuzz.utils;

import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;

import net.minecraft.network.chat.MutableComponent;

import org.jetbrains.annotations.Nullable;
Expand All @@ -33,6 +32,7 @@ public class MixinUtil {
public static boolean audit(@Nullable FabricClientCommandSource source) {
boolean ok;
MutableComponent response;

try {
MixinEnvironment.getCurrentEnvironment().audit();
response = Messenger.s("Mixin environment audited successfully");
Expand All @@ -42,9 +42,11 @@ public static boolean audit(@Nullable FabricClientCommandSource source) {
response = Messenger.s(String.format("Mixin environment auditing failed, check console for more information (%s)", e));
ok = false;
}

if (source != null) {
Messenger.tell(source, response);
}

return ok;
}
}
1 change: 1 addition & 0 deletions versions/26.2/fuzz.accesswidener
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
accessWidener v1 official
16 changes: 16 additions & 0 deletions versions/26.2/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Fabric Properties
# check these on https://fabricmc.net/develop/
minecraft_version = 26.2

# Fabric Mod Metadata
minecraft_dependency = >=26.2
fabric_api_dependency = >=0.153.0+26.2

# Build Infomation
game_versions = 26.2

fabric_api_version = 0.153.0+26.2
# fabric_module_version = 0.133.10+1.21.9

# https://masa.dy.fi/maven/carpet/fabric-carpet/
# carpet_core_version = 1.21.11-1.4.193+v251211
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* This file is part of the Fuzz project, licensed under the
* GNU Lesser General Public License v3.0
*
* Copyright (C) 2025 1024_byteeeee and contributors
*
* Fuzz is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Fuzz is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Fuzz. If not, see <https://www.gnu.org/licenses/>.
*/

package top.byteeeee.fuzz.mixin.rule.blockOutlineColor_Width;

import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;

import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.multiplayer.ClientLevel;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import top.byteeeee.annotationtoolbox.annotation.GameVersion;
import top.byteeeee.fuzz.utils.compat.DummyInterface;

@GameVersion(version = "Minecraft < 21.2")
@Environment(EnvType.CLIENT)
@Mixin(DummyInterface.class)
public interface LevelRendererAccessor {}
Loading
Loading