em

xiewuzhiying · Oct 16, 2024 · 7a1831f · 7a1831f
1 parent e543eb3
commit 7a1831f
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 33 deletions.
diff --git a/...va/io/github/xiewuzhiying/vs_addition/mixin/create/deployer/MixinDeployerBlockEntity.java b/...va/io/github/xiewuzhiying/vs_addition/mixin/create/deployer/MixinDeployerBlockEntity.java
@@ -7,7 +7,7 @@
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
 import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour;
 import com.simibubi.create.foundation.utility.Lang;
-import io.github.xiewuzhiying.vs_addition.compats.create.behaviour.deployer.DeployerScrollOptionSlot;
+import io.github.xiewuzhiying.vs_addition.compats.create.content.kinetics.deployer.DeployerScrollOptionSlot;
 import io.github.xiewuzhiying.vs_addition.mixinducks.create.deployer.IDeployerBehavior;
 import io.github.xiewuzhiying.vs_addition.stuff.InteractiveConditionTester;
 import me.fallenbreath.conditionalmixin.api.annotation.Condition;

diff --git a/...uzhiying/vs_addition/mixin/vs_clockwork/client/flap_bearing/MixinFlapBearingRenderer.java b/...uzhiying/vs_addition/mixin/vs_clockwork/client/flap_bearing/MixinFlapBearingRenderer.java
@@ -3,7 +3,7 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.content.redstone.link.LinkRenderer;
-import io.github.xiewuzhiying.vs_addition.compats.create.behaviour.link.DualLinkRenderer;
+import io.github.xiewuzhiying.vs_addition.compats.create.content.redstone.link.DualLinkRenderer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;

diff --git a/...xiewuzhiying/vs_addition/mixin/vs_clockwork/flap_bearing/MixinFlapBearingBlockEntity.java b/...xiewuzhiying/vs_addition/mixin/vs_clockwork/flap_bearing/MixinFlapBearingBlockEntity.java
@@ -5,7 +5,7 @@
 import com.simibubi.create.content.redstone.link.LinkBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform;
-import io.github.xiewuzhiying.vs_addition.compats.create.behaviour.link.DualLinkBehaviour;
+import io.github.xiewuzhiying.vs_addition.compats.create.content.redstone.link.DualLinkBehaviour;
 import io.github.xiewuzhiying.vs_addition.compats.vs_clockwork.behaviour.flap_bearing.FlapBearingLinkFrequencySlot;
 import io.github.xiewuzhiying.vs_addition.compats.vs_clockwork.behaviour.flap_bearing.FlapBearingLinkFrequencySlotNegative;
 import io.github.xiewuzhiying.vs_addition.mixinducks.vs_clockwork.flap_bearing.FlapBearingBlockEntityMixinDuck;

diff --git a/...iour/deployer/DeployerScrollOptionSlot.kt → ...tics/deployer/DeployerScrollOptionSlot.kt b/...iour/deployer/DeployerScrollOptionSlot.kt → ...tics/deployer/DeployerScrollOptionSlot.kt
@@ -1,4 +1,4 @@
-package io.github.xiewuzhiying.vs_addition.compats.create.behaviour.deployer
+package io.github.xiewuzhiying.vs_addition.compats.create.content.kinetics.deployer
 
 import com.simibubi.create.content.contraptions.DirectionalExtenderScrollOptionSlot
 import net.minecraft.core.Direction

diff --git a/...reate/behaviour/link/DualLinkBehaviour.kt → ...ontent/redstone/link/DualLinkBehaviour.kt b/...reate/behaviour/link/DualLinkBehaviour.kt → ...ontent/redstone/link/DualLinkBehaviour.kt
@@ -1,4 +1,4 @@
-package io.github.xiewuzhiying.vs_addition.compats.create.behaviour.link
+package io.github.xiewuzhiying.vs_addition.compats.create.content.redstone.link
 
 import com.simibubi.create.Create
 import com.simibubi.create.content.equipment.clipboard.ClipboardCloneable

diff --git a/...create/behaviour/link/DualLinkRenderer.kt → ...content/redstone/link/DualLinkRenderer.kt b/...create/behaviour/link/DualLinkRenderer.kt → ...content/redstone/link/DualLinkRenderer.kt
@@ -1,4 +1,4 @@
-package io.github.xiewuzhiying.vs_addition.compats.create.behaviour.link
+package io.github.xiewuzhiying.vs_addition.compats.create.content.redstone.link
 
 import com.mojang.blaze3d.vertex.PoseStack
 import com.simibubi.create.CreateClient

diff --git a/...c/main/java/io/github/xiewuzhiying/vs_addition/fabric/mixin/create/MixinCommonEvents.java b/...c/main/java/io/github/xiewuzhiying/vs_addition/fabric/mixin/create/MixinCommonEvents.java
@@ -2,7 +2,7 @@
 
 
 import com.simibubi.create.foundation.events.CommonEvents;
-import io.xiewuzhiying.vs_addition.fabric.compats.create.behaviour.link.DualLinkHandler;
+import io.xiewuzhiying.vs_addition.fabric.compats.create.content.redstone.link.DualLinkHandler;
 import net.fabricmc.fabric.api.event.player.UseBlockCallback;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;

diff --git a/...java/io/github/xiewuzhiying/vs_addition/fabric/mixin/create/client/MixinClientEvents.java b/...java/io/github/xiewuzhiying/vs_addition/fabric/mixin/create/client/MixinClientEvents.java
@@ -1,7 +1,7 @@
 package io.github.xiewuzhiying.vs_addition.fabric.mixin.create.client;
 
 import com.simibubi.create.foundation.events.ClientEvents;
-import io.github.xiewuzhiying.vs_addition.compats.create.behaviour.link.DualLinkRenderer;
+import io.github.xiewuzhiying.vs_addition.compats.create.content.redstone.link.DualLinkRenderer;
 import net.minecraft.client.Minecraft;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;

diff --git a/.../create/behaviour/link/DualLinkHandler.kt → .../content/redstone/link/DualLinkHandler.kt b/.../create/behaviour/link/DualLinkHandler.kt → .../content/redstone/link/DualLinkHandler.kt
@@ -1,11 +1,11 @@
-package io.xiewuzhiying.vs_addition.fabric.compats.create.behaviour.link
+package io.xiewuzhiying.vs_addition.fabric.compats.create.content.redstone.link
 
 import com.simibubi.create.AllItems
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour
 import com.simibubi.create.foundation.utility.AdventureUtil
 import com.simibubi.create.foundation.utility.RaycastHelper
 import net.fabricmc.fabric.api.entity.FakePlayer
-import io.github.xiewuzhiying.vs_addition.compats.create.behaviour.link.DualLinkBehaviour
+import io.github.xiewuzhiying.vs_addition.compats.create.content.redstone.link.DualLinkBehaviour
 import net.minecraft.sounds.SoundEvents
 import net.minecraft.sounds.SoundSource
 import net.minecraft.world.InteractionHand

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -47,8 +47,8 @@ version = minecraft_version + "-" + String.valueOf(loader_platform).toLowerCase(
 dependencies {
     forge "net.minecraftforge:forge:$forge_version"
 
-    implementation 'org.ow2.asm:asm:9.2'
-    implementation 'org.ow2.asm:asm-commons:9.2'
+//    implementation 'org.ow2.asm:asm:9.2'
+//    implementation 'org.ow2.asm:asm-commons:9.2'
 
     // Architectury API
     include(modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}")

diff --git a/...wuzhiying/vs_addition/forge/asm/Test.java → ...ition/forge/asm/tallyho/TallyhoPatch.java b/...wuzhiying/vs_addition/forge/asm/Test.java → ...ition/forge/asm/tallyho/TallyhoPatch.java
@@ -1,10 +1,10 @@
-package io.github.xiewuzhiying.vs_addition.forge.asm;
+package io.github.xiewuzhiying.vs_addition.forge.asm.tallyho;
 
 import com.chocohead.mm.Asm;
 import com.chocohead.mm.api.ClassTinkerers;
 
 @Asm
-public class Test implements Runnable {
+public class TallyhoPatch implements Runnable {
     @Override
     public void run() {
         ClassTinkerers.addTransformation("edn.stratodonut.tallyho.client.ClientEvents", classNode -> classNode.methods.removeIf(method -> method.name.contains("onBleedout")));

diff --git a/...java/io/github/xiewuzhiying/vs_addition/forge/mixin/tallyho/client/MixinClientEvents.java b/...java/io/github/xiewuzhiying/vs_addition/forge/mixin/tallyho/client/MixinClientEvents.java
diff --git a/forge/src/main/kotlin/io/github/xiewuzhiying/vs_addition/forge/VSAdditionModForge.kt b/forge/src/main/kotlin/io/github/xiewuzhiying/vs_addition/forge/VSAdditionModForge.kt
@@ -8,11 +8,11 @@ import io.github.xiewuzhiying.vs_addition.VSAdditionMod
 import io.github.xiewuzhiying.vs_addition.VSAdditionMod.init
 import io.github.xiewuzhiying.vs_addition.VSAdditionMod.initClient
 import io.github.xiewuzhiying.vs_addition.compats.computercraft.PeripheralCommon.registerGenericPeripheralCommon
-import io.github.xiewuzhiying.vs_addition.compats.create.behaviour.link.DualLinkRenderer
+import io.github.xiewuzhiying.vs_addition.compats.create.content.redstone.link.DualLinkRenderer
 import io.github.xiewuzhiying.vs_addition.forge.compats.computercraft.ForgePeripheralProvider
 import io.github.xiewuzhiying.vs_addition.forge.compats.computercraft.PeripheralForge.registerGenericPeripheralForge
-import io.github.xiewuzhiying.vs_addition.forge.compats.create.behaviour.link.DualLinkHandler
-import io.github.xiewuzhiying.vs_addition.forge.compats.create.redstone.display_link.target.FramedSignDisplayTarget
+import io.github.xiewuzhiying.vs_addition.forge.compats.create.content.redstone.link.DualLinkHandler
+import io.github.xiewuzhiying.vs_addition.forge.compats.create.content.redstone.display_link.target.FramedSignDisplayTarget
 import io.github.xiewuzhiying.vs_addition.stuff.EntityFreshCaller
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerLevel

diff --git a/...ay_link/target/FramedSignDisplayTarget.kt → ...ay_link/target/FramedSignDisplayTarget.kt b/...ay_link/target/FramedSignDisplayTarget.kt → ...ay_link/target/FramedSignDisplayTarget.kt
@@ -1,4 +1,4 @@
-package io.github.xiewuzhiying.vs_addition.forge.compats.create.redstone.display_link.target
+package io.github.xiewuzhiying.vs_addition.forge.compats.create.content.redstone.display_link.target
 
 import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext
 import com.simibubi.create.content.redstone.displayLink.target.DisplayTarget

diff --git a/.../create/behaviour/link/DualLinkHandler.kt → .../content/redstone/link/DualLinkHandler.kt b/.../create/behaviour/link/DualLinkHandler.kt → .../content/redstone/link/DualLinkHandler.kt
@@ -1,9 +1,9 @@
-package io.github.xiewuzhiying.vs_addition.forge.compats.create.behaviour.link
+package io.github.xiewuzhiying.vs_addition.forge.compats.create.content.redstone.link
 
 import com.simibubi.create.AllItems
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour
 import com.simibubi.create.foundation.utility.RaycastHelper
-import io.github.xiewuzhiying.vs_addition.compats.create.behaviour.link.DualLinkBehaviour
+import io.github.xiewuzhiying.vs_addition.compats.create.content.redstone.link.DualLinkBehaviour
 import net.minecraft.sounds.SoundEvents
 import net.minecraft.sounds.SoundSource
 import net.minecraft.world.InteractionResult