-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7cff996
commit 5732e4e
Showing
7 changed files
with
241 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
src/main/java/club/mcams/carpet/mixin/rule/meekEnderman/EndermanEntityMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * This file is part of the Carpet AMS Addition project, licensed under the | ||
| * GNU Lesser General Public License v3.0 | ||
| * | ||
| * Copyright (C) 2025 A Minecraft Server and contributors | ||
| * | ||
| * Carpet AMS Addition 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. | ||
| * | ||
| * Carpet AMS Addition 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 Carpet AMS Addition. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package club.mcams.carpet.mixin.rule.meekEnderman; | ||
|
|
||
| import club.mcams.carpet.AmsServerSettings; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.ModifyReturnValue; | ||
|
|
||
| import net.minecraft.entity.mob.EndermanEntity; | ||
|
|
||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
|
|
||
| @SuppressWarnings("SimplifiableConditionalExpression") | ||
| @Mixin(EndermanEntity.class) | ||
| public abstract class EndermanEntityMixin { | ||
| @ModifyReturnValue(method = "isPlayerStaring", at = @At("RETURN")) | ||
| private boolean goodBaby(boolean original) { | ||
| return AmsServerSettings.meekEnderman ? false : original; | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
src/main/java/club/mcams/carpet/mixin/rule/tntPowerController/TntEntityMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * This file is part of the Carpet AMS Addition project, licensed under the | ||
| * GNU Lesser General Public License v3.0 | ||
| * | ||
| * Copyright (C) 2025 A Minecraft Server and contributors | ||
| * | ||
| * Carpet AMS Addition 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. | ||
| * | ||
| * Carpet AMS Addition 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 Carpet AMS Addition. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package club.mcams.carpet.mixin.rule.tntPowerController; | ||
|
|
||
| import club.mcams.carpet.AmsServerSettings; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.ModifyExpressionValue; | ||
|
|
||
| import net.minecraft.entity.TntEntity; | ||
|
|
||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
|
|
||
| @Mixin(TntEntity.class) | ||
| public abstract class TntEntityMixin { | ||
| //#if MC>=12102 | ||
| //$$ @ModifyExpressionValue(method = "<init>(Lnet/minecraft/entity/EntityType;Lnet/minecraft/world/World;)V", at = @At(value = "CONSTANT", args = "floatValue=4.0F")) | ||
| //#else | ||
| @ModifyExpressionValue(method = "explode", at = @At(value = "CONSTANT", args = "floatValue=4.0F")) | ||
| //#endif | ||
| private float modifyTntPower(float original) { | ||
| return AmsServerSettings.tntPowerController != -1.0D ? (float) AmsServerSettings.tntPowerController : original; | ||
| } | ||
| } |
95 changes: 95 additions & 0 deletions
95
...e/witchRedstoneDustDropController_witchGlowstoneDustDropController/LivingEntityMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * This file is part of the Carpet AMS Addition project, licensed under the | ||
| * GNU Lesser General Public License v3.0 | ||
| * | ||
| * Copyright (C) 2024 A Minecraft Server and contributors | ||
| * | ||
| * Carpet AMS Addition 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. | ||
| * | ||
| * Carpet AMS Addition 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 Carpet AMS Addition. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package club.mcams.carpet.mixin.rule.witchRedstoneDustDropController_witchGlowstoneDustDropController; | ||
|
|
||
| import club.mcams.carpet.AmsServerSettings; | ||
|
|
||
| import net.minecraft.entity.LivingEntity; | ||
| import net.minecraft.entity.mob.WitchEntity; | ||
| //#if MC>=12102 | ||
| //$$ import net.minecraft.server.world.ServerWorld; | ||
| //#endif | ||
| import net.minecraft.item.Item; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.item.Items; | ||
|
|
||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Unique; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| @Mixin(LivingEntity.class) | ||
| public abstract class LivingEntityMixin { | ||
| @Inject(method = "dropLoot", at = @At("TAIL")) | ||
| private void customRedstoneDustDrop(CallbackInfo ci) { | ||
| if (AmsServerSettings.witchRedstoneDustDropController != -1) { | ||
| LivingEntity livingEntity = (LivingEntity) (Object) this; | ||
| //#if MC>=12102 | ||
| //$$ ServerWorld world = (ServerWorld) livingEntity.getEntityWorld(); | ||
| //#endif | ||
| int redstoneCount = AmsServerSettings.witchRedstoneDustDropController; | ||
| compatWitchDropStack( | ||
| Items.REDSTONE, redstoneCount, | ||
| //#if MC>=12102 | ||
| //$$ world, | ||
| //#endif | ||
| livingEntity | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| @Inject(method = "dropLoot", at = @At("TAIL")) | ||
| private void customGlowstoneDustDrop(CallbackInfo ci) { | ||
| if (AmsServerSettings.witchGlowstoneDustDropController != -1) { | ||
| LivingEntity livingEntity = (LivingEntity) (Object) this; | ||
| //#if MC>=12102 | ||
| //$$ ServerWorld world = (ServerWorld) livingEntity.getEntityWorld(); | ||
| //#endif | ||
| int glowstoneCount = AmsServerSettings.witchGlowstoneDustDropController; | ||
| compatWitchDropStack( | ||
| Items.GLOWSTONE_DUST, glowstoneCount, | ||
| //#if MC>=12102 | ||
| //$$ world, | ||
| //#endif | ||
| livingEntity | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| @Unique | ||
| private static void compatWitchDropStack( | ||
| Item item, int count, | ||
| //#if MC>=12102 | ||
| //$$ ServerWorld world, | ||
| //#endif | ||
| LivingEntity livingEntity | ||
| ) { | ||
| if (livingEntity instanceof WitchEntity) { | ||
| livingEntity.dropStack( | ||
| //#if MC>=12102 | ||
| //$$ world, | ||
| //#endif | ||
| new ItemStack(item, count) | ||
| ); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters