Skip to content

v1.6.8 #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1024-byteeeee merged 4 commits into from
Jan 23, 2026
Merged

v1.6.8 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca311c9
修复单人模式下其他实体也生效的BUG
1024-byteeeee Jan 23, 2026
021ba8e
移除Carpet
1024-byteeeee Jan 23, 2026
54dca7a
移除Carpet
1024-byteeeee Jan 23, 2026
29d04cb
1.6.8-beta.1
1024-byteeeee Jan 23, 2026
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
4 changes: 2 additions & 2 deletions common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ dependencies {
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
modRuntimeOnly "carpet:fabric-carpet:${project.carpet_core_version}"
// modRuntimeOnly "carpet:fabric-carpet:${project.carpet_core_version}"
include(modImplementation("com.github.1024-byteeeee:AnnotationToolBox:${project.annotationtoolbox_version}"))
include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
include(implementation("top.1024byteeeee:tiny_yaml:${project.tiny_yaml_version}"))
modRuntimeOnly("top.1024byteeeee:carpet-ams-addition:${project.carpetamsaddition_version}")
// modRuntimeOnly("top.1024byteeeee:carpet-ams-addition:${project.carpetamsaddition_version}")
}

loom {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ loader_version = 0.18.2
# Mod Properties
mod_id = fuzz
mod_name = Fuzz
mod_version = 1.6.7
mod_version = 1.6.8-beta.1
maven_group = top.1024byteeeee
archives_base_name = Fuzz

Expand Down
15 changes: 11 additions & 4 deletions src/main/java/top/byteeeee/fuzz/mixin/rule/cobwebSlowDownDisabled/CobwebMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@

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

import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

import net.minecraft.block.BlockState;
import net.minecraft.block.CobwebBlock;
Expand All @@ -31,17 +32,23 @@
import org.spongepowered.asm.mixin.injection.At;

import top.byteeeee.fuzz.FuzzSettings;
import top.byteeeee.fuzz.helpers.Noop;
import top.byteeeee.fuzz.utils.ClientUtil;

@Mixin(CobwebBlock.class)
public abstract class CobwebMixin {
@WrapWithCondition(
@WrapOperation(
method = "onEntityCollision",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/entity/Entity;slowMovement(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Vec3d;)V"
)
)
private boolean slowDownDisabled(Entity entity, BlockState state, Vec3d multiplier) {
return !FuzzSettings.cobwebSlowDownDisabled;
private void slowDownDisabled(Entity entity, BlockState state, Vec3d multiplier, Operation<Void> original) {
if (FuzzSettings.cobwebSlowDownDisabled && entity.equals(ClientUtil.getCurrentPlayer())) {
Noop.noop();
} else {
original.call(entity, state, multiplier);
}
}
}
4 changes: 3 additions & 1 deletion src/main/java/top/byteeeee/fuzz/mixin/rule/fluidPushDisabled/PlayerEntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@
import org.spongepowered.asm.mixin.injection.At;

import top.byteeeee.fuzz.FuzzSettings;
import top.byteeeee.fuzz.utils.ClientUtil;

@SuppressWarnings("SimplifiableConditionalExpression")
@Environment(EnvType.CLIENT)
@Mixin(PlayerEntity.class)
public abstract class PlayerEntityMixin {
@ModifyReturnValue(method = "isPushedByFluids", at = @At("RETURN"))
public boolean isPushedByFluids(boolean original) {
return FuzzSettings.fluidPushDisabled ? false : original;
PlayerEntity player = (PlayerEntity) (Object) this;
return FuzzSettings.fluidPushDisabled && player.equals(ClientUtil.getCurrentPlayer()) ? false : original;
}
}
4 changes: 0 additions & 4 deletions versions/1.16.5/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.42.0+1.16
game_versions = 1.16.5

fabric_api_version = 0.42.0+1.16

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.16.5-1.4.44+v210714
carpetamsaddition_version = 2.62.0-mc1.16.5
4 changes: 0 additions & 4 deletions versions/1.17.1/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.46.1+1.17
game_versions = 1.17.1

fabric_api_version = 0.46.1+1.17

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.17.1-1.4.57+v220119
carpetamsaddition_version = 2.62.0-mc1.17.1
4 changes: 0 additions & 4 deletions versions/1.18.2/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.76.0+1.18.2
game_versions = 1.18.2

fabric_api_version = 0.76.0+1.18.2

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.18.2-1.4.69+v220331
carpetamsaddition_version = 2.62.0-mc1.18.2
4 changes: 0 additions & 4 deletions versions/1.19.4/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.85.0+1.19.4
game_versions = 1.19.4

fabric_api_version = 0.85.0+1.19.4

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.19.4-1.4.100+v230314
carpetamsaddition_version = 2.62.0-mc1.19.4
4 changes: 0 additions & 4 deletions versions/1.20.6/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.97.8+1.20.6
game_versions = 1.20.6

fabric_api_version = 0.97.8+1.20.6

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.20.6-1.4.141+v240429
carpetamsaddition_version = 2.62.0-mc1.20.6
4 changes: 0 additions & 4 deletions versions/1.21.1/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.102.0+1.21.1
game_versions = 1.21.1

fabric_api_version = 0.102.0+1.21.1

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.21-1.4.147+v240613
carpetamsaddition_version = 2.62.0-mc1.21.1
4 changes: 0 additions & 4 deletions versions/1.21.10/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,3 @@ game_versions = 1.21.10

fabric_api_version = 0.134.1+1.21.10
# fabric_module_version = 0.133.10+1.21.9

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.21.9-pre1-1.4.184+v250916
carpetamsaddition_version = 2.62.0-mc1.21.10
4 changes: 0 additions & 4 deletions versions/1.21.11/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,3 @@ game_versions = 1.21.11

fabric_api_version = 0.139.5+1.21.11
# 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
carpetamsaddition_version = 2.62.0-mc1.21.11
4 changes: 0 additions & 4 deletions versions/1.21.2/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.106.1+1.21.2
game_versions = 1.21.2

fabric_api_version = 0.106.1+1.21.2

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.21.2-1.4.158+v241022
carpetamsaddition_version = 2.62.0-mc1.21.2
4 changes: 0 additions & 4 deletions versions/1.21.3/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.106.1+1.21.3
game_versions = 1.21.3

fabric_api_version = 0.106.1+1.21.3

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.21.2-1.4.158+v241022
carpetamsaddition_version = 2.62.0-mc1.21.3
4 changes: 0 additions & 4 deletions versions/1.21.4/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.115.0+1.21.4
game_versions = 1.21.4

fabric_api_version = 0.115.0+1.21.4

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.21.4-1.4.161+v241203
carpetamsaddition_version = 2.62.0-mc1.21.4
4 changes: 0 additions & 4 deletions versions/1.21.5/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.119.6+1.21.5
game_versions = 1.21.5

fabric_api_version = 0.119.6+1.21.5

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.21.5-1.4.169+v250325
carpetamsaddition_version = 2.62.0-mc1.21.5
4 changes: 0 additions & 4 deletions versions/1.21.6/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.127.1+1.21.6
game_versions = 1.21.6

fabric_api_version = 0.127.1+1.21.6

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.21.6-1.4.176+v250617
carpetamsaddition_version = 2.62.0-mc1.21.6
4 changes: 0 additions & 4 deletions versions/1.21.7/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.128.2+1.21.7
game_versions = 1.21.7

fabric_api_version = 0.128.2+1.21.7

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.21.7-1.4.177+v250630
carpetamsaddition_version = 2.62.0-mc1.21.7
4 changes: 0 additions & 4 deletions versions/1.21.8/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.129.0+1.21.8
game_versions = 1.21.8

fabric_api_version = 0.129.0+1.21.8

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.21.7-1.4.177+v250630
carpetamsaddition_version = 2.62.0-mc1.21.8
4 changes: 0 additions & 4 deletions versions/1.21.9/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,3 @@ game_versions = 1.21.9

fabric_api_version = 0.133.14+1.21.9
# fabric_module_version = 0.133.10+1.21.9

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.21.9-pre1-1.4.184+v250916
carpetamsaddition_version = 2.62.0-mc1.21.9
4 changes: 0 additions & 4 deletions versions/1.21/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ fabric_api_dependency = >=0.100.1+1.21
game_versions = 1.21

fabric_api_version = 0.100.1+1.21

# https://masa.dy.fi/maven/carpet/fabric-carpet/
carpet_core_version = 1.21-1.4.147+v240613
carpetamsaddition_version = 2.62.0-mc1.21
Loading