Fix build for Sinytras Connector

build.gradle

@@ -1,5 +1,5 @@
-plugins {id 'fabric-loom' version '1.3.+'
-	id "io.github.juuxel.loom-vineflower" version "1.+" // Vineflower
+plugins {
+	id 'fabric-loom' version '1.9-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -27,10 +27,6 @@ configurations.configureEach {
 	}
 }
 
-loom {
-	accessWidenerPath =  file("src/main/resources/territorial.accesswidener")
-}
-
 dependencies {
 	minecraft "com.mojang:minecraft:$project.minecraft_version"
 	mappings "org.quiltmc:quilt-mappings:$minecraft_version+build.$qm_version:intermediary-v2" // Use Quilt Mappings
@@ -40,12 +36,10 @@ dependencies {
 
 	// Mod Menu
 	modCompileOnly "com.terraformersmc:modmenu:$project.modmenu_version"
-	// Cloth Config
-	modLocalRuntime "com.terraformersmc:modmenu:$project.modmenu_version"
-	modApi "me.shedaniel.cloth:cloth-config-fabric:$project.cloth_config_version"
+
 	// Cardinal Components
-	modImplementation(include("dev.onyxstudios.cardinal-components-api:cardinal-components-base:$project.cardinal_components"))
-	modImplementation(include("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:$project.cardinal_components"))
+	/**modImplementation(include("dev.onyxstudios.cardinal-components-api:cardinal-components-base:$project.cardinal_components"))
+	modImplementation(include("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:$project.cardinal_components"))**/
 	// EMI
 	modCompileOnly "dev.emi:emi-fabric:$emi_version:api"
 	modLocalRuntime "dev.emi:emi-fabric:$emi_version"

gradle.properties

@@ -6,15 +6,15 @@ org.gradle.parallel=true
 	# check these on https://fabricmc.net/develop
 	minecraft_version=1.20.1
 	yarn_mappings=1.20.1+build.10
-	loader_version=0.14.23
+	loader_version=0.16.9
 
 # Mod Properties
 	mod_version = 0.0.1
 	maven_group = io.github.sleepy-evelyn
 	archives_base_name = territorial
 
 # Dependencies
-	fabric_version=0.90.0+1.20.1
+	fabric_version=0.92.2+1.20.1
 	modmenu_version=7.1.0
 	cloth_config_version=11.1.106
 	cardinal_components=5.2.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/io/github/sleepy_evelyn/territorial/Territorial.java

@@ -6,13 +6,10 @@
 import io.github.sleepy_evelyn.territorial.init.TerritorialBlocks;
 import io.github.sleepy_evelyn.territorial.block.entity.CorruptedBeaconBlockEntity;
 import io.github.sleepy_evelyn.territorial.init.TerritorialBlockEntities;
-import io.github.sleepy_evelyn.territorial.config.TerritorialConfigProvider;
 import io.github.sleepy_evelyn.territorial.init.TerritorialStatusEffects;
 import io.github.sleepy_evelyn.territorial.init.C2SPacketRegistry;
 import io.github.sleepy_evelyn.territorial.init.TerritorialItems;
 import io.github.sleepy_evelyn.territorial.init.TerritorialRecipes;
-import me.shedaniel.autoconfig.AutoConfig;
-import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.util.Identifier;
@@ -26,7 +23,6 @@ public class Territorial implements ModInitializer {
 
 	@Override
 	public void onInitialize() {
-		AutoConfig.register(TerritorialConfigProvider.class, Toml4jConfigSerializer::new);
 		TerritorialItems.initialize();
 		TerritorialBlocks.initialize();
 		TerritorialBlockEntities.initialize();

src/main/java/io/github/sleepy_evelyn/territorial/api/component/IPeekingEyeComponent.java

@@ -1,15 +1,12 @@
 package io.github.sleepy_evelyn.territorial.api.component;
 
-import dev.onyxstudios.cca.api.v3.component.Component;
-import dev.onyxstudios.cca.api.v3.component.sync.AutoSyncedComponent;
-import dev.onyxstudios.cca.api.v3.component.tick.ClientTickingComponent;
-import dev.onyxstudios.cca.api.v3.component.tick.ServerTickingComponent;
 import io.github.sleepy_evelyn.territorial.api.component.BoundBlockEntity;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import org.jetbrains.annotations.Nullable;
 
+/**
 public interface IPeekingEyeComponent extends Component, AutoSyncedComponent, ClientTickingComponent, ServerTickingComponent {
 
     void startPeeking(@Nullable BoundBlockEntity bbe);
@@ -22,3 +19,4 @@ public interface IPeekingEyeComponent extends Component, AutoSyncedComponent, Cl
     @Nullable BlockEntity getBoundBlockEntity();
     default Item getItemToDrop() { return Items.ENDER_EYE; }
 }
+**/

src/main/java/io/github/sleepy_evelyn/territorial/block/EclipseRoseBushBlock.java

@@ -37,7 +37,7 @@ public void onEntityCollision(BlockState state, World world, BlockPos pos, Entit
     @Override
     public void randomDisplayTick(BlockState state, World world, BlockPos pos, RandomGenerator random) {
         if(state.get(Properties.DOUBLE_BLOCK_HALF) == DoubleBlockHalf.UPPER) {
-            int maxReach = TerritorialConfig.common().getEclipseRoseMaxReach();
+            int maxReach = 16;
             eclipseDisplayTick(state, world, pos, random, DISPLAY_TICKER, 300, maxReach);
         }
     }

src/main/java/io/github/sleepy_evelyn/territorial/block/EclipseWitherRoseBlock.java

@@ -36,7 +36,7 @@ public void onEntityCollision(BlockState state, World world, BlockPos pos, Entit
     @Override
     public void randomDisplayTick(BlockState state, World world, BlockPos pos, RandomGenerator random) {
         super.randomDisplayTick(state, world, pos, random);
-        int maxReach = TerritorialConfig.common().getEclipseRoseMaxReach();
+        int maxReach = 16;
         eclipseDisplayTick(state, world, pos, random, DISPLAY_TICKER, 600, maxReach);
     }
 }

src/main/java/io/github/sleepy_evelyn/territorial/block/OmniscientObsidianBlock.java

@@ -58,7 +58,7 @@ public void randomDisplayTick(BlockState state, World world, BlockPos pos, Rando
 
 	@Override
     public void randomTick(BlockState state, ServerWorld world, BlockPos pos, RandomGenerator random) {
-        if(TerritorialConfig.common().omniscientObsidianSpread() && !world.isClient && random.nextDouble() < 0.0280D)
+        if(!world.isClient && random.nextDouble() < 0.0280D)
             tickSpread(state, world, pos, random);
     }
 

src/main/java/io/github/sleepy_evelyn/territorial/block/entity/LaserTransmitterBlockEntity.java

@@ -60,7 +60,7 @@ public class LaserTransmitterBlockEntity extends BlockEntity {
     public LaserTransmitterBlockEntity(BlockPos pos, BlockState state) {
         super(TerritorialBlockEntities.LASER_BLOCK_ENTITY_TYPE, pos, state);
         prevPower = -1;
-        maxReach = TerritorialConfig.common().getLaserTransmitterMaxReach();
+        maxReach = 32;
         lightBlocksTicker = new TickCounter(6);
         mods.put("sparkle", false);
         mods.put("rainbow", false);
@@ -191,7 +191,7 @@ private static void beamTick(World world, BlockPos pos, BlockState state, LaserT
             int watchDistanceMaxReach = (watchDistance < 2) ? 16 : (watchDistance * 16) - 16;
 
             if (be.maxReach != watchDistanceMaxReach) {
-                be.maxReach = Math.min(watchDistanceMaxReach, TerritorialConfig.common().getLaserTransmitterMaxReach());
+                be.maxReach = Math.min(watchDistanceMaxReach, 32);
                 be.markDirty();
             }
         }
@@ -201,7 +201,7 @@ private static void applyEffects(List<Entity> entities, Direction facing, LaserT
         Item armorItem;
         int numArmorPieces;
         boolean hasGoldHelmet;
-        boolean targetAllMobs = TerritorialConfig.common().laserTargetsAllMobs();
+        boolean targetAllMobs = true;
 
         for(var entity : entities) {
             if(targetAllMobs || entity.isPlayer()) {

src/main/java/io/github/sleepy_evelyn/territorial/block/entity/PlinthOfPeekingBlockEntity.java

@@ -4,12 +4,10 @@
 import io.github.sleepy_evelyn.territorial.api.component.BoundBlockEntity;
 import io.github.sleepy_evelyn.territorial.api.component.BoundBlockEntityParams;
 //import gay.sylv.territorial.api.component.IPeekingEyeComponent;
-import io.github.sleepy_evelyn.territorial.api.component.IPeekingEyeComponent;
 import io.github.sleepy_evelyn.territorial.config.TerritorialConfig;
 import io.github.sleepy_evelyn.territorial.init.TerritorialBlockEntities;
 import io.github.sleepy_evelyn.territorial.init.TerritorialBlocks;
 //import gay.sylv.territorial.component.TerritorialComponents;
-import io.github.sleepy_evelyn.territorial.component.TerritorialComponents;
 import io.github.sleepy_evelyn.territorial.util.BeaconUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -134,11 +132,12 @@ public void onBlockDestroyed() {
     public BoundBlockEntityParams getParams() {
         if(world != null)
             return new BoundBlockEntityParams(world.getDimensionKey(), pos,
-                    TerritorialConfig.common().getPlinthOfPeekingMinReach() * reachMultipliers[level]);
+                    6 * reachMultipliers[level]);
         else return null;
     }
 
 
+    /**
     private List<IPeekingEyeComponent> getBoundPlayerComponents() {
         List<IPeekingEyeComponent> components = new ArrayList<>();
 
@@ -150,6 +149,6 @@ private List<IPeekingEyeComponent> getBoundPlayerComponents() {
             }
         }
         return components;
-    }
+    }**/
 
 }

src/main/java/io/github/sleepy_evelyn/territorial/client/render/CustomRenderLayers.java

@@ -1,5 +1,6 @@
 package io.github.sleepy_evelyn.territorial.client.render;
 
+import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.blaze3d.vertex.VertexFormats;
 import net.minecraft.client.render.RenderLayer;
@@ -11,7 +12,7 @@ public CustomRenderLayers(String nameIn, VertexFormat formatIn, VertexFormat.Dra
         super(nameIn, formatIn, drawModeIn, bufferSizeIn, useDelegateIn, needsSortingIn, setupTaskIn, clearTaskIn);
     }
 
-    public static final RenderLayer QUAD_LINES = new MultiPhase("territorial_quad_lines",
+    public static final RenderLayer QUAD_LINES = CustomRenderLayers.of("territorial_quad_lines",
             VertexFormats.POSITION_COLOR, VertexFormat.DrawMode.QUADS , 256, false, false,
             MultiPhaseParameters.builder()
                     .layering(VIEW_OFFSET_Z_LAYERING)

src/main/java/io/github/sleepy_evelyn/territorial/client/render/block/entity/LaserBlockEntityRenderer.java

@@ -7,6 +7,7 @@
 import io.github.sleepy_evelyn.territorial.util.RenderUtils;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.util.math.MatrixStack;

src/main/java/io/github/sleepy_evelyn/territorial/client/render/block/entity/PlinthOfPeekingBlockEntityRenderer.java

@@ -8,6 +8,7 @@
 import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.OverlayTexture;
+import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;

src/main/java/io/github/sleepy_evelyn/territorial/component/PeekingEyeComponent.java

@@ -2,7 +2,6 @@
 
 import io.github.sleepy_evelyn.territorial.api.component.BoundBlockEntity;
 import io.github.sleepy_evelyn.territorial.api.component.BoundBlockEntityParams;
-import io.github.sleepy_evelyn.territorial.api.component.IPeekingEyeComponent;
 import io.github.sleepy_evelyn.territorial.client.sound.PeekingSoundInstance;
 import io.github.sleepy_evelyn.territorial.init.TerritorialDamageSources;
 import io.github.sleepy_evelyn.territorial.util.NetworkingUtils;
@@ -25,6 +24,7 @@
 import net.minecraft.world.dimension.DimensionType;
 import org.jetbrains.annotations.Nullable;
 
+/**
 public class PeekingEyeComponent implements IPeekingEyeComponent {
 
     private boolean isPeeking;
@@ -202,4 +202,4 @@ public void rebind(BoundBlockEntity bbe) {
         }
         return null;
     }
-}
+}**/

src/main/java/io/github/sleepy_evelyn/territorial/component/TerritorialComponents.java

@@ -1,5 +1,6 @@
 package io.github.sleepy_evelyn.territorial.component;
 
+/**
 import dev.onyxstudios.cca.api.v3.component.ComponentKey;
 import dev.onyxstudios.cca.api.v3.component.ComponentRegistry;
 import dev.onyxstudios.cca.api.v3.entity.EntityComponentFactoryRegistry;
@@ -18,5 +19,5 @@ public class TerritorialComponents implements EntityComponentInitializer {
     public void registerEntityComponentFactories(EntityComponentFactoryRegistry registry) {
         registry.registerForPlayers(PEEKING_EYE, PeekingEyeComponent::new, RespawnCopyStrategy.NEVER_COPY);
     }
-}
+}**/
 

src/main/java/io/github/sleepy_evelyn/territorial/config/TerritorialConfig.java

@@ -27,11 +27,4 @@ public static void setClient(ClientConfigAccess clientConfig) {
         TerritorialConfig.clientConfig = clientConfig;
     }
 
-    public static ConfigAccess common() {
-        return config;
-    }
-
-    public static ClientConfigAccess client() {
-        return clientConfig;
-    }
 }

src/main/java/io/github/sleepy_evelyn/territorial/config/TerritorialConfigProvider.java

@@ -1,6 +1,7 @@
 package io.github.sleepy_evelyn.territorial.config;
 
 import io.github.sleepy_evelyn.territorial.api.TerritorialAPI;
+/**
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.autoconfig.annotation.Config;
 import me.shedaniel.autoconfig.annotation.ConfigEntry;
@@ -97,3 +98,4 @@ public int getLaserTransmitterMaxReach() {
         return (int) constrainValue(tweaks.laserTransmitterMaxReach, LTMR_MIN, LTMR_MAX);
     }
 }
+ **/

src/main/java/io/github/sleepy_evelyn/territorial/init/TerritorialRecipes.java

@@ -31,7 +31,7 @@ public final class TerritorialRecipes {
 	);
 
     public static void initialize() {
-        if(TerritorialConfig.common().omniscientObsidianRecipe())
+        //if(TerritorialConfig.common().omniscientObsidianRecipe())
             register( "crafting_omniscient_obsidian", OMNISCIENT_OBSIDIAN_RECIPE_SERIALIZER);
     }
 

src/main/java/io/github/sleepy_evelyn/territorial/integration/modmenu/TerritorialModMenuProvider.java

@@ -1,14 +1,8 @@
 package io.github.sleepy_evelyn.territorial.integration.modmenu;
 
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-import io.github.sleepy_evelyn.territorial.config.TerritorialConfigProvider;
-import me.shedaniel.autoconfig.AutoConfig;
-import net.minecraft.client.gui.screen.Screen;
-
-public class TerritorialModMenuProvider implements ModMenuApi {
+/**public class TerritorialModMenuProvider implements ModMenuApi {
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
         return parent -> (Screen) AutoConfig.getConfigScreen(TerritorialConfigProvider.class, parent).get();
     }
-}
+}**/

src/main/resources/fabric.mod.json

@@ -26,9 +26,6 @@
     ],
     "emi": [
       "io.github.sleepy_evelyn.territorial.integration.emi.TerritorialEmiProvider"
-    ],
-    "modmenu": [
-      "io.github.sleepy_evelyn.territorial.integration.modmenu.TerritorialModMenuProvider"
     ]
   },
   "mixins": [