build(modkit): v1.1.2

fix(dhd): texture

build.gradle

@@ -48,7 +48,7 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	include(modImplementation("com.github.pavatus:sakitus:${project.sakitus_version}")) {
+	modImplementation("com.github.amblelabs:modkit:${project.Amble_version}") {
 		exclude(group: "net.fabricmc.fabric-api")
 	}
 

gradle.properties

@@ -17,6 +17,6 @@ mod_version_qualifier=beta
 
 # Dependencies
 fabric_version=0.92.3+1.20.1
-sakitus_version=v1.0.13-1.20
+Amble_version=v1.1.2-1.20
 scheduler_version = main-SNAPSHOT
 tech_version = 3.0.0

src/main/java/dev/amble/stargate/StargateMod.java

@@ -1,7 +1,8 @@
 package dev.amble.stargate;
 
+import dev.amble.stargate.api.PointOfOriginRegistry;
 import dev.amble.stargate.core.*;
-import dev.pavatus.lib.container.RegistryContainer;
+import dev.amble.lib.container.RegistryContainer;
 import dev.amble.stargate.api.StargateServerData;
 import dev.amble.stargate.core.entities.DHDControlEntity;
 import net.fabricmc.api.ModInitializer;
@@ -30,6 +31,8 @@ public void onInitialize() {
 		StargateServerData.init();
 
 		entityAttributeRegister();
+
+		PointOfOriginRegistry.getInstance().register();
 	}
 
 	public void entityAttributeRegister() {

src/main/java/dev/amble/stargate/api/Address.java

@@ -1,6 +1,7 @@
 package dev.amble.stargate.api;
 
-import dev.pavatus.lib.data.DirectedGlobalPos;
+import dev.amble.lib.data.DirectedGlobalPos;
+import dev.amble.lib.data.DistanceInformation;
 import dev.amble.stargate.StargateMod;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.text.Style;
@@ -35,10 +36,7 @@ public Text toGlyphs() {
 	}
 
 	public DistanceInformation distanceTo(Address other) {
-		double distance = Math.sqrt(pos.getPos().getSquaredDistance(other.pos.getPos()));
-		boolean dimChange = pos.getDimension() != other.pos.getDimension();
-		boolean rotChange = pos.getRotation() != other.pos.getRotation();
-		return new DistanceInformation(distance, dimChange, rotChange);
+		return this.pos.distanceTo(other.pos);
 	}
 
 	public static Text toGlyphs(String text) {

src/main/java/dev/amble/stargate/api/PointOfOriginRegistry.java

@@ -5,8 +5,8 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.JsonOps;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dev.pavatus.lib.api.Identifiable;
-import dev.pavatus.lib.register.datapack.SimpleDatapackRegistry;
+import dev.amble.lib.api.Identifiable;
+import dev.amble.lib.register.datapack.SimpleDatapackRegistry;
 import dev.amble.stargate.StargateMod;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.util.Identifier;

src/main/java/dev/amble/stargate/api/ServerStargateNetwork.java

@@ -2,7 +2,7 @@
 
 import dev.drtheo.scheduler.api.Scheduler;
 import dev.drtheo.scheduler.api.TimeUnit;
-import dev.pavatus.lib.util.ServerLifecycleHooks;
+import dev.amble.lib.util.ServerLifecycleHooks;
 import dev.amble.stargate.StargateMod;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;

src/main/java/dev/amble/stargate/api/Stargate.java

@@ -1,8 +1,8 @@
 package dev.amble.stargate.api;
 
-import dev.pavatus.lib.data.DirectedGlobalPos;
-import dev.pavatus.lib.util.ServerLifecycleHooks;
-import dev.pavatus.lib.util.TeleportUtil;
+import dev.amble.lib.data.DirectedGlobalPos;
+import dev.amble.lib.util.ServerLifecycleHooks;
+import dev.amble.lib.util.TeleportUtil;
 import dev.amble.stargate.core.StargateSounds;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.nbt.NbtCompound;

src/main/java/dev/amble/stargate/api/StargateCall.java

@@ -2,7 +2,7 @@
 
 import dev.drtheo.scheduler.api.Scheduler;
 import dev.drtheo.scheduler.api.TimeUnit;
-import dev.pavatus.lib.util.ServerLifecycleHooks;
+import dev.amble.lib.util.ServerLifecycleHooks;
 import dev.amble.stargate.core.StargateSounds;
 import dev.amble.stargate.core.block.entities.StargateBlockEntity;
 import net.minecraft.server.MinecraftServer;

src/main/java/dev/amble/stargate/api/StargateEnergy.java

@@ -1,5 +1,7 @@
 package dev.amble.stargate.api;
 
+import dev.amble.lib.data.DistanceInformation;
+
 public interface StargateEnergy {
 	long getEnergy();
 	long getMaxEnergy();

src/main/java/dev/amble/stargate/api/StargateNetwork.java

@@ -1,6 +1,6 @@
 package dev.amble.stargate.api;
 
-import dev.pavatus.lib.data.DirectedGlobalPos;
+import dev.amble.lib.data.DirectedGlobalPos;
 import dev.amble.stargate.StargateMod;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.MinecraftClient;

src/main/java/dev/amble/stargate/api/StargateServerData.java

@@ -1,7 +1,7 @@
 package dev.amble.stargate.api;
 
 
-import dev.pavatus.lib.util.ServerLifecycleHooks;
+import dev.amble.lib.util.ServerLifecycleHooks;
 import dev.amble.stargate.StargateMod;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.minecraft.nbt.NbtCompound;

src/main/java/dev/amble/stargate/api/WorldUtil.java

@@ -1,7 +1,7 @@
 package dev.amble.stargate.api;
 
-import dev.pavatus.lib.data.DirectedGlobalPos;
-import dev.pavatus.lib.util.ServerLifecycleHooks;
+import dev.amble.lib.data.DirectedGlobalPos;
+import dev.amble.lib.util.ServerLifecycleHooks;
 import net.minecraft.block.BlockState;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.server.world.ServerWorld;
@@ -13,7 +13,7 @@
 import net.minecraft.world.Heightmap;
 import net.minecraft.world.World;
 
-// todo - move into sakitus
+// todo - move into Amble
 public class WorldUtil {
 	private static final int SAFE_RADIUS = 3;
 

src/main/java/dev/amble/stargate/core/StargateBlockEntities.java

@@ -1,6 +1,6 @@
 package dev.amble.stargate.core;
 
-import dev.pavatus.lib.container.impl.BlockEntityContainer;
+import dev.amble.lib.container.impl.BlockEntityContainer;
 import dev.amble.stargate.core.block.entities.DHDBlockEntity;
 import dev.amble.stargate.core.block.entities.StargateBlockEntity;
 import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;

src/main/java/dev/amble/stargate/core/StargateBlocks.java

@@ -1,12 +1,12 @@
 package dev.amble.stargate.core;
 
-import dev.pavatus.lib.block.ABlockSettings;
-import dev.pavatus.lib.container.impl.BlockContainer;
-import dev.pavatus.lib.container.impl.NoBlockItem;
-import dev.pavatus.lib.datagen.util.AutomaticModel;
-import dev.pavatus.lib.datagen.util.NoEnglish;
-import dev.pavatus.lib.datagen.util.PickaxeMineable;
-import dev.pavatus.lib.item.AItemSettings;
+import dev.amble.lib.block.ABlockSettings;
+import dev.amble.lib.container.impl.BlockContainer;
+import dev.amble.lib.container.impl.NoBlockItem;
+import dev.amble.lib.datagen.util.AutomaticModel;
+import dev.amble.lib.datagen.util.NoEnglish;
+import dev.amble.lib.datagen.util.PickaxeMineable;
+import dev.amble.lib.item.AItemSettings;
 import dev.amble.stargate.core.block.DHDBlock;
 import dev.amble.stargate.core.block.StargateBlock;
 import dev.amble.stargate.core.block.StargateRingBlock;
@@ -24,6 +24,7 @@ public class StargateBlocks extends BlockContainer {
 			.pistonBehavior(PistonBehavior.IGNORE).luminance(light -> 3));
 	@PickaxeMineable(tool = PickaxeMineable.Tool.IRON)
 	@NoEnglish
+	@AutomaticModel(justItem = true)
 	public static final Block DHD = new DHDBlock(ABlockSettings.create().nonOpaque().requiresTool().instrument(Instrument.BASEDRUM).strength(0.5F, 6.0F)
 			.pistonBehavior(PistonBehavior.IGNORE).luminance(light -> 3));
 	@NoBlockItem

src/main/java/dev/amble/stargate/core/StargateEntities.java

@@ -1,6 +1,6 @@
 package dev.amble.stargate.core;
 
-import dev.pavatus.lib.container.impl.EntityContainer;
+import dev.amble.lib.container.impl.EntityContainer;
 import dev.amble.stargate.core.entities.DHDControlEntity;
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
 import net.minecraft.entity.EntityDimensions;

src/main/java/dev/amble/stargate/core/StargateItems.java

@@ -1,9 +1,9 @@
 package dev.amble.stargate.core;
 
-import dev.pavatus.lib.container.impl.ItemContainer;
-import dev.pavatus.lib.container.impl.ItemGroupContainer;
-import dev.pavatus.lib.item.AItemSettings;
-import dev.pavatus.lib.itemgroup.AItemGroup;
+import dev.amble.lib.container.impl.ItemContainer;
+import dev.amble.lib.container.impl.ItemGroupContainer;
+import dev.amble.lib.item.AItemSettings;
+import dev.amble.lib.itemgroup.AItemGroup;
 import dev.amble.stargate.StargateMod;
 import dev.amble.stargate.core.item.DialerItem;
 import net.minecraft.item.Item;

src/main/java/dev/amble/stargate/core/StargateSounds.java

@@ -1,6 +1,6 @@
 package dev.amble.stargate.core;
 
-import dev.pavatus.lib.container.impl.SoundContainer;
+import dev.amble.lib.container.impl.SoundContainer;
 import dev.amble.stargate.StargateMod;
 import net.minecraft.sound.SoundEvent;
 

src/main/java/dev/amble/stargate/core/block/StargateRingBlock.java

@@ -1,6 +1,6 @@
 package dev.amble.stargate.core.block;
 
-import dev.pavatus.lib.api.ICantBreak;
+import dev.amble.lib.api.ICantBreak;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockRenderType;
 import net.minecraft.block.BlockState;

src/main/java/dev/amble/stargate/core/block/entities/StargateBlockEntity.java

@@ -1,7 +1,7 @@
 package dev.amble.stargate.core.block.entities;
 
 import dev.amble.stargate.api.*;
-import dev.pavatus.lib.data.DirectedGlobalPos;
+import dev.amble.lib.data.DirectedGlobalPos;
 import dev.amble.stargate.StargateMod;
 import dev.amble.stargate.core.StargateBlockEntities;
 import dev.amble.stargate.core.StargateBlocks;

src/main/java/dev/amble/stargate/core/item/StargateLinkableItem.java

@@ -1,7 +1,7 @@
 package dev.amble.stargate.core.item;
 
 import dev.amble.stargate.api.*;
-import dev.pavatus.lib.data.DirectedGlobalPos;
+import dev.amble.lib.data.DirectedGlobalPos;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.Item;

src/main/java/dev/amble/stargate/datagen/SGDataGenerator.java

@@ -1,11 +1,11 @@
 package dev.amble.stargate.datagen;
 
-import dev.pavatus.lib.datagen.lang.LanguageType;
-import dev.pavatus.lib.datagen.lang.SakitusLanguageProvider;
-import dev.pavatus.lib.datagen.loot.SakitusBlockLootTable;
-import dev.pavatus.lib.datagen.model.SakitusModelProvider;
-import dev.pavatus.lib.datagen.sound.SakitusSoundProvider;
-import dev.pavatus.lib.datagen.tag.SakitusBlockTagProvider;
+import dev.amble.lib.datagen.lang.LanguageType;
+import dev.amble.lib.datagen.lang.AmbleLanguageProvider;
+import dev.amble.lib.datagen.loot.AmbleBlockLootTable;
+import dev.amble.lib.datagen.model.AmbleModelProvider;
+import dev.amble.lib.datagen.sound.AmbleSoundProvider;
+import dev.amble.lib.datagen.tag.AmbleBlockTagProvider;
 import dev.amble.stargate.core.StargateBlocks;
 import dev.amble.stargate.core.StargateItems;
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
@@ -25,7 +25,7 @@ public void onInitializeDataGenerator(FabricDataGenerator gen) {
 
     private void genModels(FabricDataGenerator.Pack pack) {
         pack.addProvider((((output, registriesFuture) -> {
-            SakitusModelProvider provider = new SakitusModelProvider(output);
+            AmbleModelProvider provider = new AmbleModelProvider(output);
 
             provider.withBlocks(StargateBlocks.class);
             provider.withItems(StargateItems.class);
@@ -34,10 +34,10 @@ private void genModels(FabricDataGenerator.Pack pack) {
         })));
     }
     private void genTags(FabricDataGenerator.Pack pack) {
-        pack.addProvider((((output, registriesFuture) -> new SakitusBlockTagProvider(output, registriesFuture).withBlocks(StargateBlocks.class))));
+        pack.addProvider((((output, registriesFuture) -> new AmbleBlockTagProvider(output, registriesFuture).withBlocks(StargateBlocks.class))));
     }
     private void genLoot(FabricDataGenerator.Pack pack) {
-         pack.addProvider((((output, registriesFuture) -> new SakitusBlockLootTable(output).withBlocks(StargateBlocks.class))));
+         pack.addProvider((((output, registriesFuture) -> new AmbleBlockLootTable(output).withBlocks(StargateBlocks.class))));
     }
 
     private void genLang(FabricDataGenerator.Pack pack) {
@@ -46,7 +46,7 @@ private void genLang(FabricDataGenerator.Pack pack) {
 
     private void genEnglish(FabricDataGenerator.Pack pack) {
         pack.addProvider((((output, registriesFuture) -> {
-            SakitusLanguageProvider provider = new SakitusLanguageProvider(output, LanguageType.EN_US);
+            AmbleLanguageProvider provider = new AmbleLanguageProvider(output, LanguageType.EN_US);
 
             provider.translateBlocks(StargateBlocks.class);
             provider.addTranslation(StargateBlocks.DHD, "Dial-Home Device");
@@ -64,7 +64,7 @@ private void genEnglish(FabricDataGenerator.Pack pack) {
 
     private void genSounds(FabricDataGenerator.Pack pack) {
         pack.addProvider((((output, registriesFuture) -> {
-            SakitusSoundProvider provider = new SakitusSoundProvider(output);
+            AmbleSoundProvider provider = new AmbleSoundProvider(output);
 
             return provider;
         })));

src/main/resources/fabric.mod.json

@@ -25,9 +25,6 @@
 		],
 		"client": [
           "dev.amble.stargate.client.StargateModClient"
-		],
-		"sakitus-main": [
-          "dev.amble.stargate.sakitus.SakitusHandler"
 		]
 	},
 	"mixins": [