Skip to content

Commit c4dfd25

Browse files
sakura-ryokosakura-ryoko
committed
refactor more mixins
1 parent 7760963 commit c4dfd25

19 files changed

+47
-48
lines changed

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinClientCommonNetworkHandler.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/network/MixinClientCommonNetworkHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.network;
22

33
import net.minecraft.client.network.ClientCommonNetworkHandler;
44
import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinClientPlayNetworkHandler.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/network/MixinClientPlayNetworkHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.network;
22

33
import net.minecraft.block.BlockState;
44
import net.minecraft.block.Blocks;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinClientPlayerInteractionManager.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/network/MixinClientPlayerInteractionManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.network;
22

33
import org.spongepowered.asm.mixin.Final;
44
import org.spongepowered.asm.mixin.Mixin;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinServerPlayNetworkHandler.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/network/MixinServerPlayNetworkHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.network;
22

33
import org.spongepowered.asm.mixin.Mixin;
44
import org.spongepowered.asm.mixin.injection.At;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinExplosionEmitterParticle.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/render/MixinExplosionEmitterParticle.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.render;
22

33
import net.minecraft.client.particle.ExplosionEmitterParticle;
44
import net.minecraft.client.particle.NoRenderParticle;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinParticleManager.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/render/MixinParticleManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.render;
22

33
import org.spongepowered.asm.mixin.Mixin;
44
import org.spongepowered.asm.mixin.injection.At;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/IMixinChunkLightProvider.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/world/IMixinChunkLightProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.world;
22

33
import org.spongepowered.asm.mixin.Mixin;
44
import org.spongepowered.asm.mixin.gen.Accessor;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/IMixinClientWorld.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/world/IMixinClientWorld.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.world;
22

33
import java.util.Map;
44
import org.spongepowered.asm.mixin.Mixin;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinBuiltChunk.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/world/MixinBuiltChunk.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.world;
22

33
import org.spongepowered.asm.mixin.Mixin;
44
import org.spongepowered.asm.mixin.injection.At;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinChunkBuilder_BuiltChunk.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/world/MixinChunkBuilder_BuiltChunk.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.world;
22

33
import org.spongepowered.asm.mixin.Mixin;
44
import org.spongepowered.asm.mixin.injection.At;
55
import org.spongepowered.asm.mixin.injection.Inject;
66
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
77
import net.minecraft.client.render.chunk.ChunkBuilder;
8-
import net.minecraft.util.math.BlockPos;
98
import fi.dy.masa.tweakeroo.config.FeatureToggle;
109

1110
@Mixin(ChunkBuilder.BuiltChunk.class)

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinClientWorld.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/world/MixinClientWorld.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.world;
22

33
import fi.dy.masa.tweakeroo.config.Configs;
44
import net.minecraft.block.BlockState;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinClientWorld_Properties.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/world/MixinClientWorld_Properties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.world;
22

33
import org.spongepowered.asm.mixin.Mixin;
44
import org.spongepowered.asm.mixin.injection.At;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinDimensionEffects_Nether.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/world/MixinDimensionEffects_Nether.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.world;
22

33
import org.spongepowered.asm.mixin.Mixin;
44
import org.spongepowered.asm.mixin.injection.At;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinLightingProvider.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/world/MixinLightingProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.world;
22

33
import org.jetbrains.annotations.Nullable;
44
import org.spongepowered.asm.mixin.Final;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinServerChunkLoadingManager.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/world/MixinServerChunkLoadingManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.world;
22

33
import java.util.function.BooleanSupplier;
44
import org.spongepowered.asm.mixin.Mixin;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinUpdateStructureBlockC2SPacket.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/world/MixinUpdateStructureBlockC2SPacket.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.world;
22

33
import org.objectweb.asm.Opcodes;
44
import org.spongepowered.asm.mixin.Mixin;

‎src/main/java/fi/dy/masa/tweakeroo/mixin/MixinWorld.java ‎src/main/java/fi/dy/masa/tweakeroo/mixin/world/MixinWorld.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fi.dy.masa.tweakeroo.mixin;
1+
package fi.dy.masa.tweakeroo.mixin.world;
22

33
import java.util.function.Consumer;
44

‎src/main/java/fi/dy/masa/tweakeroo/util/MiscUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package fi.dy.masa.tweakeroo.util;
22

33
import java.awt.image.BufferedImage;
4-
import java.io.File;
54
import java.nio.file.Files;
65
import java.nio.file.Path;
76
import java.text.SimpleDateFormat;
@@ -12,6 +11,7 @@
1211
import javax.annotation.Nullable;
1312
import javax.imageio.ImageIO;
1413

14+
import fi.dy.masa.tweakeroo.mixin.world.IMixinClientWorld;
1515
import net.minecraft.block.Block;
1616
import net.minecraft.block.BlockState;
1717
import net.minecraft.block.MapColor;

‎src/main/resources/mixins.tweakeroo.json

+29-29
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,27 @@
33
"package": "fi.dy.masa.tweakeroo.mixin",
44
"minVersion": "0.8",
55
"compatibilityLevel": "JAVA_21",
6-
"client": [
7-
"IMixinChunkLightProvider",
8-
"IMixinClientWorld",
6+
"mixins": [
97
"IMixinCustomizeFlatLevelScreen",
108
"IMixinSimpleOption",
119
"MixinAbstractSignEditScreen",
12-
"render.MixinBackgroundRenderer",
13-
"render.MixinBeaconBlockEntityRenderer",
14-
"render.MixinBlockEntityRenderDispatcher",
1510
"MixinBossBarHud",
16-
"MixinBuiltChunk",
1711
"MixinChatHud",
1812
"MixinChatScreen",
19-
"MixinChunkBuilder_BuiltChunk",
2013
"MixinClientBossBar",
2114
"MixinClientCommandSource",
22-
"MixinClientCommonNetworkHandler",
23-
"MixinClientPlayerInteractionManager",
24-
"MixinClientPlayNetworkHandler",
25-
"MixinClientWorld",
26-
"MixinClientWorld_Properties",
2715
"MixinCloneCommand",
2816
"MixinCommandBlockScreen",
2917
"MixinCreativeInventoryScreen",
30-
"MixinDimensionEffects_Nether",
31-
"render.MixinEntityRenderDispatcher",
32-
"MixinExplosionEmitterParticle",
3318
"MixinFillCommand",
34-
"render.MixinGameRenderer",
35-
"render.MixinGameRenderer_ViewBob",
36-
"render.MixinHeldItemRenderer",
3719
"MixinInGameHud",
3820
"MixinKeyboardInput",
39-
"MixinLightingProvider",
4021
"MixinMinecraftClient",
41-
"render.MixinMobSpawnerBlockEntityRenderer",
4222
"MixinMouse",
43-
"MixinParticleManager",
4423
"MixinPlayerAbilities",
45-
"MixinServerChunkLoadingManager",
46-
"MixinServerPlayNetworkHandler",
4724
"MixinStatusEffectsDisplay",
4825
"MixinTeleportSpectatorMenu",
49-
"MixinUpdateStructureBlockC2SPacket",
50-
"render.MixinWeatherRendering",
5126
"MixinWindow",
52-
"MixinWorld",
53-
"render.MixinWorldRenderer",
5427
"block.IMixinAbstractBlock",
5528
"block.IMixinCommandBlockExecutor",
5629
"block.IMixinPistonBlock",
@@ -80,7 +53,34 @@
8053
"item.MixinBundleItem",
8154
"item.MixinItem",
8255
"item.MixinItemGroup",
83-
"item.MixinItemStack"
56+
"item.MixinItemStack",
57+
"network.MixinClientCommonNetworkHandler",
58+
"network.MixinClientPlayerInteractionManager",
59+
"network.MixinClientPlayNetworkHandler",
60+
"network.MixinServerPlayNetworkHandler",
61+
"render.MixinBackgroundRenderer",
62+
"render.MixinBeaconBlockEntityRenderer",
63+
"render.MixinBlockEntityRenderDispatcher",
64+
"render.MixinEntityRenderDispatcher",
65+
"render.MixinExplosionEmitterParticle",
66+
"render.MixinGameRenderer",
67+
"render.MixinGameRenderer_ViewBob",
68+
"render.MixinHeldItemRenderer",
69+
"render.MixinMobSpawnerBlockEntityRenderer",
70+
"render.MixinParticleManager",
71+
"render.MixinWeatherRendering",
72+
"render.MixinWorldRenderer",
73+
"world.IMixinChunkLightProvider",
74+
"world.IMixinClientWorld",
75+
"world.MixinBuiltChunk",
76+
"world.MixinChunkBuilder_BuiltChunk",
77+
"world.MixinClientWorld",
78+
"world.MixinClientWorld_Properties",
79+
"world.MixinDimensionEffects_Nether",
80+
"world.MixinLightingProvider",
81+
"world.MixinServerChunkLoadingManager",
82+
"world.MixinUpdateStructureBlockC2SPacket",
83+
"world.MixinWorld"
8484
],
8585
"mixinPriority": 990,
8686
"injectors": {

0 commit comments

Comments
 (0)