Merge remote-tracking branch 'upstream/dev' into dev

BlueBoat29 · BlueBoat29 · commit 458f4963d719 · 2026-03-26T09:15:55.000-05:00
diff --git a/src/main/java/su/terrafirmagreg/core/client/renderer/OreHighlightRenderer.java b/src/main/java/su/terrafirmagreg/core/client/renderer/OreHighlightRenderer.java
@@ -1,4 +1,4 @@
-package su.terrafirmagreg.core.client;
+package su.terrafirmagreg.core.client.renderer;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/main/java/su/terrafirmagreg/core/client/renderer/OreHighlightVeinRenderer.java b/src/main/java/su/terrafirmagreg/core/client/renderer/OreHighlightVeinRenderer.java
@@ -1,4 +1,4 @@
-package su.terrafirmagreg.core.client;
+package su.terrafirmagreg.core.client.renderer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/su/terrafirmagreg/core/compat/jade/TFGJadePlugin.java b/src/main/java/su/terrafirmagreg/core/compat/jade/TFGJadePlugin.java
@@ -1,4 +1,4 @@
-package su.terrafirmagreg.core.client;
+package su.terrafirmagreg.core.compat.jade;
 
 import net.minecraft.resources.ResourceLocation;
 
@@ -16,6 +16,6 @@ public class TFGJadePlugin implements IWailaPlugin {
 
     @Override
     public void registerClient(IWailaClientRegistration registration) {
-        registration.registerBlockComponent(TierLockedComponent.INSTANCE, TierLockedBlock.class);
+        registration.registerBlockComponent(TierLockedProvider.INSTANCE, TierLockedBlock.class);
     }
 }
diff --git a/src/main/java/su/terrafirmagreg/core/compat/jade/TierLockedProvider.java b/src/main/java/su/terrafirmagreg/core/compat/jade/TierLockedProvider.java
@@ -1,4 +1,4 @@
-package su.terrafirmagreg.core.client;
+package su.terrafirmagreg.core.compat.jade;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
@@ -11,7 +11,7 @@
 import snownee.jade.api.config.IPluginConfig;
 
 @SuppressWarnings("removal")
-public enum TierLockedComponent implements IBlockComponentProvider {
+public enum TierLockedProvider implements IBlockComponentProvider {
     INSTANCE;
 
     @Override
diff --git a/src/main/java/su/terrafirmagreg/core/network/packet/OreHighlightPacket.java b/src/main/java/su/terrafirmagreg/core/network/packet/OreHighlightPacket.java
@@ -8,7 +8,7 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.network.NetworkEvent;
 
-import su.terrafirmagreg.core.client.OreHighlightRenderer;
+import su.terrafirmagreg.core.client.renderer.OreHighlightRenderer;
 
 public record OreHighlightPacket(List<BlockPos> positions) {
 
diff --git a/src/main/java/su/terrafirmagreg/core/network/packet/OreHighlightVeinPacket.java b/src/main/java/su/terrafirmagreg/core/network/packet/OreHighlightVeinPacket.java
@@ -11,7 +11,7 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.network.NetworkEvent;
 
-import su.terrafirmagreg.core.client.OreHighlightVeinRenderer;
+import su.terrafirmagreg.core.client.renderer.OreHighlightVeinRenderer;
 
 public record OreHighlightVeinPacket(List<BlockPos> veinCenters) {
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package su.terrafirmagreg.core.client;`
	`1`	`+package su.terrafirmagreg.core.client.renderer;`
`2`	`2`
`3`	`3`	`import java.util.ArrayList;`
`4`	`4`	`import java.util.Iterator;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package su.terrafirmagreg.core.client;`
	`1`	`+package su.terrafirmagreg.core.compat.jade;`
`2`	`2`
`3`	`3`	`import net.minecraft.resources.ResourceLocation;`
`4`	`4`
`@@ -16,6 +16,6 @@ public class TFGJadePlugin implements IWailaPlugin {`
`16`	`16`
`17`	`17`	`@Override`
`18`	`18`	`public void registerClient(IWailaClientRegistration registration) {`
`19`		`- registration.registerBlockComponent(TierLockedComponent.INSTANCE, TierLockedBlock.class);`
	`19`	`+ registration.registerBlockComponent(TierLockedProvider.INSTANCE, TierLockedBlock.class);`
`20`	`20`	`}`
`21`	`21`	`}`