Newer Create Version Support

build.gradle

@@ -250,6 +250,9 @@ repositories {
         name = 'mali'
         url = "https://raw.github.com/MegumiKasuga/kasuga-maven/mali_1.1.0/"
     }
+    maven { url = "https://maven.createmod.net" } // Create, Ponder, Flywheel
+    maven { url = "https://maven.ithundxr.dev/mirror" } // Registrate
+    maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // ForgeConfigAPIPort
 
     mavenLocal()
     flatDir {
@@ -267,9 +270,13 @@ dependencies {
     // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft 'net.minecraftforge:forge:1.20.1-47.1.3'
-    implementation fg.deobf("com.simibubi.create:create-${create_minecraft_version}:${create_version}:slim") { transitive = false }
-    implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
-    implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
+    implementation(fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false })
+    implementation(fg.deobf("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}"))
+    compileOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}"))
+    runtimeOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}"))
+    implementation(fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}"))
+    compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
+    implementation("io.github.llamalad7:mixinextras-forge:0.4.1")
     //    compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api")
     //    // at runtime, use the full JEI jar
     //    runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}")
@@ -357,10 +364,6 @@ dependencies {
     shadedLib 'org.apache.httpcomponents:httpcore:4.4.14'
     shadedLib 'org.apache.httpcomponents:httpclient:4.5.13'
 
-    compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
-    implementation(jarJar("io.github.llamalad7:mixinextras-forge:0.4.1")) {
-        jarJar.ranged(it, "[0.4.1,)")
-    }
 
 
     // testImplementation "edu.carole:Mixed-Arithmetic-Logic-Interpreter:1.0.0"

gradle.properties

@@ -37,13 +37,15 @@ mc_version=1.20.1
 
 jarVersion = 1.20.1-0.21.4-create
 
-create_minecraft_version = 1.20.1
-flywheel_minecraft_version = 1.20.1
-create_version = 0.5.1.j-55
-flywheel_version = 0.6.11-13
-
+create_version = 6.0.8-289
+ponder_version = 1.0.91
+flywheel_version = 1.0.5
 registrate_version = MC1.20-1.3.3
-
+#Proxy for parchment mapping
+systemProp.http.proxyHost=127.0.0.1
+systemProp.http.proxyPort=7897
+systemProp.https.proxyHost=127.0.0.1
+systemProp.https.proxyPort=7897
 # =========================
 # compile options
 # =========================

src/generated/resources/kasuga.mixins.json

@@ -6,32 +6,31 @@
   "refmap": "kasuga.refmap.json",
   "mixins": [
     "MixinNbtUtils",
+    "MixinStationBlockEntity",
     "MultiPackResourceManagerAccessor",
     "ReloadableResourceManagerAccessor",
-    "resources.DelegatingPackResourcesMixin",
-    "resources.FilePackResourceMixin",
-    "resources.PathPackResourceMixin",
-    "MixinStationBlockEntity",
+    "create.EdgeDataMixin",
     "create.GlobalRailwayManagerMixin",
-    "create.TrackGraphMixin",
-    "create.TrackGraphAccessor",
     "create.SignalPropagatorMixin",
-    "create.EdgeDataMixin",
-    "create.TrainMixin"
+    "create.TrackGraphAccessor",
+    "create.TrackGraphMixin",
+    "create.TrackTargetingClientMixin",
+    "create.TrainMixin",
+    "resources.DelegatingPackResourcesMixin",
+    "resources.FilePackResourceMixin",
+    "resources.PathPackResourceMixin"
   ],
   "client": [
+    "client.MixinBezierConnection",
     "client.MixinBlockModel$Deserializer",
     "client.MixinBlockModelBinding",
     "client.MixinBlockModelShaper",
-    "client.MixinTextureManager",
-    "client.MixinBezierConnection",
     "client.MixinBlockRenderDispatcher",
     "client.MixinCarriageContraptionEntityRenderer",
-    "client.MixinStationBlockEntityClient",
     "client.MixinDirectoryLister",
-    "client.MixinTextureManager",
-    "client.MixinBlockModelShaper",
-    "client.MixinGameRenderer"
+    "client.MixinGameRenderer",
+    "client.MixinStationBlockEntityClient",
+    "client.MixinTextureManager"
   ],
   "minVersion": "0.8"
 }

src/main/java/kasuga/lib/KasugaLib.java

@@ -8,24 +8,9 @@
 import kasuga.lib.core.client.frontend.webserver.GuiWebServerEndpoint;
 import kasuga.lib.core.javascript.commands.JavascriptModuleCommands;
 import kasuga.lib.core.packets.AllPackets;
-import kasuga.lib.core.util.Envs;
-import kasuga.lib.core.resource.KasugaPackResource;
 import kasuga.lib.core.webserver.KasugaHttpServer;
-import kasuga.lib.example_env.ExampleMain;
-import kasuga.lib.example_env.AllExampleElements;
-import kasuga.lib.mixins.mixin.MultiPackResourceManagerAccessor;
-import kasuga.lib.mixins.mixin.ReloadableResourceManagerAccessor;
 import lombok.Getter;
-import net.minecraft.client.Minecraft;
-import net.minecraft.core.RegistryAccess;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.ReloadableServerResources;
-import net.minecraft.server.WorldLoader;
-import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.resources.*;
-import net.minecraft.world.level.storage.LevelStorageSource;
-import net.minecraft.world.level.storage.WorldData;
-import kasuga.lib.example_env.ExampleMain;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.DistExecutor;
@@ -56,8 +41,6 @@ public KasugaLib() {
         FrontendCommands.invoke();
         KasugaLibConfig.invoke();
         KasugaHttpServer.invoke();
-        if (Envs.isDevEnvironment())
-            ExampleMain.invoke();
         DistExecutor.unsafeRunWhenOn(Dist.CLIENT,()-> LayoutEngines::init);
         DistExecutor.unsafeRunWhenOn(Dist.CLIENT,()-> GuiWebServerEndpoint::invoke);
     }

src/main/java/kasuga/lib/core/base/CustomTrackRenderer.java

@@ -1,16 +1,16 @@
 package kasuga.lib.core.base;
 
-import com.jozufozu.flywheel.core.PartialModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Axis;
 import com.simibubi.create.content.trains.track.TrackBlock;
 import com.simibubi.create.content.trains.track.TrackMaterial;
 import com.simibubi.create.content.trains.track.TrackShape;
-import com.simibubi.create.foundation.render.CachedBufferer;
-import com.simibubi.create.foundation.render.SuperByteBuffer;
+import dev.engine_room.flywheel.lib.model.baked.PartialModel;
 import kasuga.lib.KasugaLib;
 import kasuga.lib.registrations.create.TrackMaterialReg;
+import net.createmod.catnip.render.CachedBuffers;
+import net.createmod.catnip.render.SuperByteBuffer;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -40,12 +40,12 @@ public synchronized void render(BlockState state, BlockPos pos, BlockAndTintGett
             material = getBlock().getMaterial();
             offset = KasugaLib.STACKS.getCachedTrackMaterial(material).trackOffsets();
         }
-        PartialModel left = material.getModelHolder().segment_left(),
-                right = material.getModelHolder().segment_right(),
+        PartialModel left = material.getModelHolder().leftSegment(),
+                right = material.getModelHolder().rightSegment(),
                 tie = material.getModelHolder().tie();
-        SuperByteBuffer leftBuffer = CachedBufferer.partial(left, state),
-                rightBuffer = CachedBufferer.partial(right, state),
-                tieBuffer = CachedBufferer.partial(tie, state);
+        SuperByteBuffer leftBuffer = CachedBuffers.partial(left, state),
+                rightBuffer = CachedBuffers.partial(right, state),
+                tieBuffer = CachedBuffers.partial(tie, state);
         TrackShape shape = state.getValue(TrackBlock.SHAPE);
         Direction direction = getFacingMapping(shape);
         if (direction == Direction.DOWN) {

src/main/java/kasuga/lib/core/create/BogeyDataConstants.java

@@ -1,6 +1,6 @@
 package kasuga.lib.core.create;
 
-import com.simibubi.create.foundation.utility.NBTHelper;
+import net.createmod.catnip.nbt.NBTHelper;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 

src/main/java/kasuga/lib/core/create/SimpleTrackBlock.java

@@ -1,7 +1,6 @@
 package kasuga.lib.core.create;
 
 import com.simibubi.create.content.equipment.wrench.IWrenchable;
-import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
 import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
 import com.simibubi.create.content.trains.track.*;
 import com.simibubi.create.foundation.block.IBE;
@@ -16,7 +15,7 @@
 import javax.annotation.Nonnull;
 import java.util.function.Supplier;
 
-public class SimpleTrackBlock extends TrackBlock implements IBE<TrackBlockEntity>, IWrenchable, ITrackBlock, ISpecialBlockItemRequirement, ProperWaterloggedBlock {
+public class SimpleTrackBlock extends TrackBlock implements IBE<TrackBlockEntity>, IWrenchable, ITrackBlock, ProperWaterloggedBlock {
     @Nonnull private final BogeySelector selector;
     public SimpleTrackBlock(@Nonnull BogeySelector selector, Properties properties, TrackMaterial material) {
         super(properties, material);

src/main/java/kasuga/lib/core/create/boundary/BoundarySegmentRegistry.java

@@ -1,6 +1,5 @@
 package kasuga.lib.core.create.boundary;
 
-import com.ibm.icu.impl.ICUResourceBundle;
 import com.simibubi.create.content.trains.graph.EdgePointType;
 import net.minecraft.resources.ResourceLocation;
 
@@ -9,7 +8,6 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 public class BoundarySegmentRegistry
 {

src/main/java/kasuga/lib/core/create/boundary/CustomBoundary.java

@@ -3,9 +3,8 @@
 import com.simibubi.create.content.trains.graph.DimensionPalette;
 import com.simibubi.create.content.trains.graph.TrackGraph;
 import com.simibubi.create.content.trains.signal.SingleBlockEntityEdgePoint;
-import com.simibubi.create.foundation.utility.Iterate;
+import net.createmod.catnip.data.Iterate;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.resources.ResourceLocation;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/kasuga/lib/core/create/boundary/CustomTrackSegmentPropagator.java

@@ -2,13 +2,13 @@
 
 import com.simibubi.create.Create;
 import com.simibubi.create.content.trains.graph.*;
-import com.simibubi.create.foundation.utility.Couple;
-import com.simibubi.create.foundation.utility.Iterate;
 import kasuga.lib.KasugaLib;
 import kasuga.lib.core.create.graph.EdgeExtraData;
 import kasuga.lib.core.create.graph.GraphExtraData;
 import kasuga.lib.core.create.graph.TrackEdgeLocation;
 import kasuga.lib.core.util.data_type.Pair;
+import net.createmod.catnip.data.Couple;
+import net.createmod.catnip.data.Iterate;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.*;

src/main/java/kasuga/lib/core/create/device/TrainDeviceProvider.java

@@ -1,6 +1,5 @@
 package kasuga.lib.core.create.device;
 
-import kasuga.lib.core.create.device.TrainDeviceManager;
 
 public interface TrainDeviceProvider {
     TrainDeviceManager getDeviceManager();

src/main/java/kasuga/lib/core/create/edge_point/EdgePointBlockEntity.java

@@ -1,7 +1,6 @@
 package kasuga.lib.core.create.edge_point;
 
 import com.simibubi.create.content.trains.graph.EdgePointType;
-import com.simibubi.create.content.trains.signal.SingleBlockEntityEdgePoint;
 import com.simibubi.create.content.trains.signal.TrackEdgePoint;
 import com.simibubi.create.content.trains.track.TrackTargetingBehaviour;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;

src/main/java/kasuga/lib/core/create/graph/EdgeExtraPayload.java

@@ -1,7 +1,6 @@
 package kasuga.lib.core.create.graph;
 
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
 
 public interface EdgeExtraPayload {
     CompoundTag write();

src/main/java/kasuga/lib/core/create/graph/RailwayData.java

@@ -1,6 +1,5 @@
 package kasuga.lib.core.create.graph;
 
-import com.simibubi.create.content.trains.entity.Train;
 import com.simibubi.create.content.trains.graph.DimensionPalette;
 import com.simibubi.create.content.trains.graph.TrackGraph;
 import kasuga.lib.core.create.boundary.ResourcePattle;

src/main/java/kasuga/lib/core/create/graph/TrackEdgeLocation.java

@@ -3,8 +3,8 @@
 import com.simibubi.create.content.trains.graph.DimensionPalette;
 import com.simibubi.create.content.trains.graph.TrackEdge;
 import com.simibubi.create.content.trains.graph.TrackNodeLocation;
-import com.simibubi.create.foundation.utility.Couple;
 import kasuga.lib.core.util.data_type.Pair;
+import net.createmod.catnip.data.Couple;
 import net.minecraft.nbt.CompoundTag;
 
 public class TrackEdgeLocation extends Pair<TrackNodeLocation,TrackNodeLocation> {

src/main/java/kasuga/lib/core/create/graph/TrainDistanceIntegrator.java

@@ -1,6 +1,5 @@
 package kasuga.lib.core.create.graph;
 
-import com.simibubi.create.content.trains.entity.Train;
 
 import java.util.WeakHashMap;
 

src/main/java/kasuga/lib/core/events/client/ModelRegistryEvent.java

@@ -3,19 +3,14 @@
 import kasuga.lib.KasugaLib;
 import kasuga.lib.core.client.render.model.MultiPartModel;
 import kasuga.lib.core.client.render.model.SimpleModel;
-import kasuga.lib.core.resource.CustomResourceReloadListener;
-import kasuga.lib.example_env.AllExampleElements;
 import kasuga.lib.core.client.render.texture.StaticImage;
-import kasuga.lib.core.client.render.texture.StaticImageHolder;
 import kasuga.lib.registrations.registry.SimpleRegistry;
 import kasuga.lib.registrations.client.ModelReg;
-import kasuga.lib.registrations.registry.SimpleRegistry;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.ModelEvent;
-import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import java.io.IOException;

src/main/java/kasuga/lib/core/projection/ScreenClickProjectionHelper.java

@@ -12,11 +12,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.event.ViewportEvent;
-import org.joml.Matrix4f;
 import org.joml.Vector4f;
 
 public class ScreenClickProjectionHelper {