Fix crashes on 1.18.2

.gitignore

@@ -1,3 +1,5 @@
+build/
+
 # User-specific stuff
 .idea/
 
@@ -23,7 +25,6 @@ atlassian-ide-plugin.xml
 *.ctxt
 
 # Package Files #
-*.jar
 *.war
 *.nar
 *.ear

README.md

@@ -1,17 +1,11 @@
-# Things
+## Original mod
+  * Original mod: https://www.curseforge.com/minecraft/mc-mods/things-fabric
+  * Original source code: https://github.com/wisp-forest/things
 
-[![curseforge](https://img.shields.io/badge/-CurseForge-gray?style=for-the-badge&logo=curseforge&labelColor=orange)](https://www.curseforge.com/minecraft/mc-mods/things-fabric)
-[![modrinth](https://img.shields.io/badge/-modrinth-gray?style=for-the-badge&labelColor=green&labelWidth=15&logo=appveyor&logoColor=white)](https://modrinth.com/mod/things)
-[![release](https://img.shields.io/github/v/release/glisco03/things?logo=github&style=for-the-badge)](https://github.com/glisco03/things/releases)
-[![discord](https://img.shields.io/discord/825828008644313089?label=wisp%20forest&logo=discord&logoColor=white&style=for-the-badge)](https://discord.gg/xrwHKktV2d)
+This is a modification for things 0.2.18+1.18 fixing some issues and adding 1.19 fixes that can be ported.
 
-## Overview
-
-Things is a collection of random trinkets, items and features that I feel enhance the Vanilla experience in a non-instrusive way. Among its features are the 
-*Enchanted Wax Gland* which lets you travel very quickly in water, the *Displacement Tome* which is essentially a Warp Book remake, the *Bater Wucket* which is an
-infinite Water Bucket and many more
-
-## Credits
- - **Pois1x** for making the textures
- - **naschhorn** for helping with the Almanac
- - **pvpTurtle** for contributing ideas
+## Fixed in 0.2.19+1.18
+- Now using fixed version of owo-lib (0.7.3+1.18)
+- Added deepslate glowstone fixture
+- Fixed Broken watch recipe error in logs (see this to know how to craft it https://github.com/wisp-forest/things/issues/43)
+- Fixed crash when generating chunks (https://github.com/wisp-forest/things/issues/41)

build.gradle

@@ -8,6 +8,11 @@ version = "${project.mod_version}+${project.minecraft_base_version}"
 group = project.maven_group
 
 repositories {
+
+    flatDir {
+        dirs 'owo-lib_local_repo'
+    }
+
     maven { url "https://maven.shedaniel.me/" }
 
     maven { url "https://maven.wispforest.io/"}

gradle.properties

@@ -7,7 +7,7 @@ minecraft_version=1.18.2
 yarn_mappings=1.18.2+build.2
 loader_version=0.13.3
 # Mod Properties
-mod_version=0.2.18
+mod_version=0.2.19
 maven_group=com.glisco
 archives_base_name=things
 # Dependencies
@@ -22,11 +22,14 @@ patchouli_version=1.18.2-66-FABRIC
 # https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items/files
 rei_version=8.0.442
 
+# https://www.curseforge.com/minecraft/mc-mods/architectury-api/files/all?filter-status=1&filter-game-version=2020709689:9008
+architectury_version=4.9.8.4
+
 # https://www.curseforge.com/minecraft/mc-mods/modmenu/files
 modmenu_version=3.1.0
 
 # https://maven.wispforest.io/io/wispforest/owo-lib/
-owo_version=0.6.0+1.18
+owo_version=0.7.3+1.18
 
 # https://github.com/CrimsonDawn45/Fabric-Shield-Lib/releases
 fabric_shield_lib_version=1.5.3-1.18

src/main/java/com/glisco/things/Things.java

@@ -19,6 +19,7 @@
 import io.wispforest.owo.particles.systems.ParticleSystem;
 import io.wispforest.owo.particles.systems.ParticleSystemController;
 import io.wispforest.owo.registration.reflect.FieldRegistrationHandler;
+import io.wispforest.owo.util.Maldenhagen;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer;
 import net.fabricmc.api.ModInitializer;
@@ -108,6 +109,7 @@ public void onInitialize() {
 
         if (CONFIG.generateGleamingOre) {
             BiomeModifications.addFeature(notNetherOrEndSelector(), GenerationStep.Feature.UNDERGROUND_ORES, GLEAMING_ORE.getKey().get());
+            Maldenhagen.injectCopium(ThingsBlocks.GLEAMING_ORE);
         }
 
         Registry.register(Registry.RECIPE_TYPE, id("sock_upgrade_crafting"), SockUpgradeRecipe.Type.INSTANCE);
@@ -126,7 +128,7 @@ public void onInitialize() {
             SHIELD_PREDICATE = SHIELD_PREDICATE.or(item -> item instanceof FabricShield);
         }
 
-        BROKEN_WATCH_RECIPE =  ImmutableSet.of(Items.LEATHER, Items.CLOCK, ThingsItems.GLEAMING_COMPOUND);
+        BROKEN_WATCH_RECIPE = ImmutableSet.of(Items.LEATHER, Items.CLOCK, ThingsItems.GLEAMING_COMPOUND);
 
         if (Owo.DEBUG) {
             CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> {

src/main/java/com/glisco/things/blocks/ThingsBlocks.java

@@ -26,6 +26,7 @@ public class ThingsBlocks implements BlockRegistryContainer {
 
     public static final Block STONE_GLOWSTONE_FIXTURE = new GlowstoneFixtureBlock();
     public static final Block QUARTZ_GLOWSTONE_FIXTURE = new GlowstoneFixtureBlock();
+    public static final Block DEEPSLATE_GLOWSTONE_FIXTURE = new GlowstoneFixtureBlock();
 
     public static final Block GLEAMING_ORE = new OreBlock(FabricBlockSettings.copyOf(Blocks.DIAMOND_ORE).luminance(5).requiresTool(), UniformIntProvider.create(3, 7));
     public static final Block DEEPSLATE_GLEAMING_ORE = new OreBlock(FabricBlockSettings.copyOf(Blocks.DEEPSLATE_DIAMOND_ORE).luminance(5).requiresTool(), UniformIntProvider.create(3, 7));

src/main/java/com/glisco/things/client/ThingsClient.java

@@ -1,12 +1,12 @@
 package com.glisco.things.client;
 
 import com.glisco.things.Things;
+import com.glisco.things.ThingsNetwork;
 import com.glisco.things.blocks.ThingsBlocks;
 import com.glisco.things.items.ThingsItems;
 import com.glisco.things.items.generic.DisplacementTomeItem;
 import com.glisco.things.items.trinkets.AppleTrinket;
 import com.glisco.things.items.trinkets.SocksItem;
-import com.glisco.things.ThingsNetwork;
 import dev.emi.trinkets.api.client.TrinketRenderer;
 import dev.emi.trinkets.api.client.TrinketRendererRegistry;
 import net.fabricmc.api.ClientModInitializer;

src/main/java/com/glisco/things/items/trinkets/ArmExtenderItem.java

@@ -2,15 +2,12 @@
 
 import com.glisco.things.Things;
 import com.glisco.things.items.TrinketItemWithOptionalTooltip;
-import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
 import com.jamieswhiteshirt.reachentityattributes.ReachEntityAttributes;
 import dev.emi.trinkets.api.SlotReference;
-import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.attribute.EntityAttribute;
 import net.minecraft.entity.attribute.EntityAttributeModifier;
-import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.item.ItemStack;
 
 import java.util.UUID;

src/main/java/com/glisco/things/misc/DisplacementTomeScreenHandler.java

@@ -1,9 +1,10 @@
 package com.glisco.things.misc;
 
 import com.glisco.things.Things;
+import com.glisco.things.ThingsNetwork;
 import com.glisco.things.items.ThingsItems;
 import com.glisco.things.items.generic.DisplacementTomeItem;
-import com.glisco.things.ThingsNetwork;
+import io.wispforest.owo.client.screens.ScreenUtils;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
@@ -101,9 +102,14 @@ public boolean onButtonClick(PlayerEntity player, int id) {
         return true;
     }
 
-    public static final record UpdateClientPacket(ItemStack tome) {}
+    @Override
+    public ItemStack transferSlot(PlayerEntity player, int index) {
+        return ScreenUtils.handleSlotTransfer(this, index, 0);
+    }
+
+    public record UpdateClientPacket(ItemStack tome) {}
 
-    public static final record ActionPacket(Action action, String data) {
+    public record ActionPacket(Action action, String data) {
         public enum Action {TELEPORT, DELETE_POINT, RENAME_POINT, CREATE_POINT}
 
         public static ActionPacket teleport(String where) {

src/main/java/com/glisco/things/mixin/EntityMixin.java

@@ -2,13 +2,11 @@
 
 import com.glisco.things.Things;
 import com.glisco.things.items.ThingsItems;
-import io.wispforest.owo.ops.ItemOps;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Vec3d;

src/main/java/com/glisco/things/mixin/LivingEntityMixin.java

@@ -11,7 +11,6 @@
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

src/main/resources/assets/things/blockstates/deepslate_glowstone_fixture.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "things:block/deepslate_glowstone_fixture"
+    },
+    "facing=up": {
+      "model": "things:block/deepslate_glowstone_fixture",
+      "x": 180
+    },
+    "facing=west": {
+      "model": "things:block/deepslate_glowstone_fixture",
+      "x": 90,
+      "y": 90
+    },
+    "facing=east": {
+      "model": "things:block/deepslate_glowstone_fixture",
+      "x": 90,
+      "y": 270
+    },
+    "facing=south": {
+      "model": "things:block/deepslate_glowstone_fixture",
+      "x": 90
+    },
+    "facing=north": {
+      "model": "things:block/deepslate_glowstone_fixture",
+      "x": 90,
+      "y": 180
+    }
+  }
+}

src/main/resources/assets/things/lang/en_us.json

@@ -4,6 +4,7 @@
 
   "block.things.stone_glowstone_fixture": "Stone Glowstone Fixture",
   "block.things.quartz_glowstone_fixture": "Quartz Glowstone Fixture",
+  "block.things.deepslate_glowstone_fixture": "Deepslate Glowstone Fixture",
   "block.things.gleaming_ore": "Gleaming Ore",
   "block.things.deepslate_gleaming_ore": "Deepslate Gleaming Ore",
   "block.things.diamond_pressure_plate": "Diamond Pressure Plate",