Util package cleanup (#624)

Unneeded things were removed, code was cleaned up, and classes were moved
to relevant existing packages.

src/main/generated/resources/data/minestuck/recipes/grist_costs/terracotta_tag.json

@@ -2,7 +2,7 @@
   "type": "minestuck:source_grist_cost",
   "grist_cost": {},
   "ingredient": {
-    "tag": "forge:terracotta"
+    "tag": "minecraft:terracotta"
   },
   "sources": [
     "minecraft:clay"

src/main/java/com/mraof/minestuck/Minestuck.java

@@ -23,11 +23,11 @@
 import com.mraof.minestuck.inventory.MSMenuTypes;
 import com.mraof.minestuck.inventory.captchalogue.ModusTypes;
 import com.mraof.minestuck.item.MSCreativeTabs;
+import com.mraof.minestuck.item.MSDispenserBehaviours;
 import com.mraof.minestuck.item.MSItems;
 import com.mraof.minestuck.item.crafting.MSRecipeTypes;
 import com.mraof.minestuck.item.loot.MSLootTables;
 import com.mraof.minestuck.player.KindAbstratusList;
-import com.mraof.minestuck.util.DispenserBehaviourUtil;
 import com.mraof.minestuck.util.MSAttachments;
 import com.mraof.minestuck.util.MSParticleType;
 import com.mraof.minestuck.util.MSSoundEvents;
@@ -135,7 +135,7 @@ private void mainThreadSetup()
 
 		KindAbstratusList.registerTypes();
 		DeployList.registerItems();
-		DispenserBehaviourUtil.registerBehaviours();
+		MSDispenserBehaviours.registerBehaviours();
 
 		ProgramData.init();
 

src/main/java/com/mraof/minestuck/alchemy/GristHelper.java

@@ -8,16 +8,32 @@
 import com.mraof.minestuck.event.GristDropsEvent;
 import com.mraof.minestuck.player.PlayerIdentifier;
 import net.minecraft.core.Holder;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.Tag;
 import net.minecraft.util.RandomSource;
 import net.minecraft.util.random.WeightedEntry;
 import net.minecraft.util.random.WeightedRandom;
 import net.neoforged.neoforge.common.NeoForge;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
-public class GristHelper
+public final class GristHelper
 {
+	private static final Logger LOGGER = LogManager.getLogger();
+
+	public static Tag encodeGristType(GristType gristType)
+	{
+		return GristTypes.REGISTRY.byNameCodec().encodeStart(NbtOps.INSTANCE, gristType).getOrThrow(false, LOGGER::error);
+	}
+
+	public static Optional<GristType> parseGristType(Tag tag)
+	{
+		return GristTypes.REGISTRY.byNameCodec().parse(NbtOps.INSTANCE, tag).resultOrPartial(LOGGER::error);
+	}
 
 	/**
 	 * An enum for indicating where the grist notifications comes from.
@@ -72,4 +88,4 @@ public static MutableGristSet generateUnderlingGristDrops(UnderlingEntity entity
 		return event.getNewDrops();
 
 	}
-}
+}

src/main/java/com/mraof/minestuck/api/alchemy/GristType.java

@@ -1,7 +1,7 @@
 package com.mraof.minestuck.api.alchemy;
 
+import com.google.common.base.Suppliers;
 import com.mraof.minestuck.Minestuck;
-import com.mraof.minestuck.util.LazyInstance;
 import net.minecraft.Util;
 import net.minecraft.core.HolderSet;
 import net.minecraft.network.chat.Component;
@@ -33,8 +33,8 @@ public final class GristType implements Comparable<GristType>
 	@Nullable
 	private final ResourceLocation textureOverrideId;
 
-	private final LazyInstance<String> translationKey = new LazyInstance<>(() -> Util.makeDescriptionId("grist", GristType.this.getId()));
-	private final LazyInstance<ResourceLocation> icon = new LazyInstance<>(() -> makeIconPath(GristType.this.getTextureId()));
+	private final Supplier<String> translationKey = Suppliers.memoize(() -> Util.makeDescriptionId("grist", GristType.this.getId()));
+	private final Supplier<ResourceLocation> icon = Suppliers.memoize(() -> makeIconPath(GristType.this.getTextureId()));
 
 	public GristType(Properties properties)
 	{
@@ -213,4 +213,4 @@ private static ResourceLocation makeIconPath(ResourceLocation textureId)
 
 	private record UnderlingData(int color, float power)
 	{}
-}
+}

src/main/java/com/mraof/minestuck/block/CassettePlayerBlock.java

@@ -1,8 +1,7 @@
 package com.mraof.minestuck.block;
 
-import com.mraof.minestuck.item.CassetteItem;
 import com.mraof.minestuck.blockentity.CassettePlayerBlockEntity;
-import com.mraof.minestuck.util.CustomVoxelShape;
+import com.mraof.minestuck.item.CassetteItem;
 import net.minecraft.core.BlockPos;
 import net.minecraft.stats.Stats;
 import net.minecraft.world.InteractionHand;

src/main/java/com/mraof/minestuck/block/CustomShapeBlock.java

@@ -1,6 +1,5 @@
 package com.mraof.minestuck.block;
 
-import com.mraof.minestuck.util.CustomVoxelShape;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.context.BlockPlaceContext;
@@ -88,4 +87,4 @@ public FluidState getFluidState(BlockState state)
 	{
 		return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
 	}
-}
+}

src/main/java/com/mraof/minestuck/util/CustomVoxelShape.java → src/main/java/com/mraof/minestuck/block/CustomVoxelShape.java

@@ -1,4 +1,4 @@
-package com.mraof.minestuck.util;
+package com.mraof.minestuck.block;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;

src/main/java/com/mraof/minestuck/block/DirectionalCustomShapeBlock.java

@@ -1,7 +1,6 @@
 package com.mraof.minestuck.block;
 
 import com.google.common.collect.ImmutableMap;
-import com.mraof.minestuck.util.CustomVoxelShape;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.context.BlockPlaceContext;
@@ -89,4 +88,4 @@ public FluidState getFluidState(BlockState state)
 	{
 		return state.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state);
 	}
-}
+}

src/main/java/com/mraof/minestuck/block/LotusTimeCapsuleBlock.java

@@ -1,7 +1,6 @@
 package com.mraof.minestuck.block;
 
 import com.mraof.minestuck.block.machine.MultiMachineBlock;
-import com.mraof.minestuck.util.CustomVoxelShape;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -47,4 +46,4 @@ public BlockState mirror(BlockState state, Mirror mirror)
 		}
 		return state;
 	}
-}
+}

src/main/java/com/mraof/minestuck/block/MSBlockShapes.java

@@ -1,6 +1,5 @@
 package com.mraof.minestuck.block;
 
-import com.mraof.minestuck.util.CustomVoxelShape;
 import net.minecraft.core.Direction;
 
 public class MSBlockShapes

src/main/java/com/mraof/minestuck/block/MSBlocks.java

@@ -10,7 +10,6 @@
 import com.mraof.minestuck.computer.theme.MSComputerThemes;
 import com.mraof.minestuck.fluid.MSFluids;
 import com.mraof.minestuck.item.MSItems;
-import com.mraof.minestuck.util.CustomVoxelShape;
 import com.mraof.minestuck.world.gen.feature.MSCFeatures;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/com/mraof/minestuck/block/SpikeBlock.java

@@ -1,6 +1,5 @@
 package com.mraof.minestuck.block;
 
-import com.mraof.minestuck.util.CustomVoxelShape;
 import com.mraof.minestuck.util.MSDamageSources;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;

src/main/java/com/mraof/minestuck/block/machine/AlchemiterBlock.java

@@ -1,9 +1,9 @@
 package com.mraof.minestuck.block.machine;
 
+import com.mraof.minestuck.block.CustomVoxelShape;
 import com.mraof.minestuck.block.EnumDowelType;
 import com.mraof.minestuck.block.MSProperties;
 import com.mraof.minestuck.blockentity.machine.AlchemiterBlockEntity;
-import com.mraof.minestuck.util.CustomVoxelShape;
 import com.mraof.minestuck.util.MSRotationUtil;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
@@ -165,4 +165,4 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
 			builder.add(DOWEL);
 		}
 	}
-}
+}

src/main/java/com/mraof/minestuck/block/machine/CruxtruderBlock.java

@@ -1,7 +1,7 @@
 package com.mraof.minestuck.block.machine;
 
+import com.mraof.minestuck.block.CustomVoxelShape;
 import com.mraof.minestuck.blockentity.machine.CruxtruderBlockEntity;
-import com.mraof.minestuck.util.CustomVoxelShape;
 import com.mraof.minestuck.util.MSRotationUtil;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
@@ -105,4 +105,4 @@ public BlockPos getMainPos(BlockState state, BlockPos pos)
 
 		return pos.offset(mainPos.rotate(rotation));
 	}
-}
+}

src/main/java/com/mraof/minestuck/block/machine/MachineBlock.java

@@ -2,7 +2,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
-import com.mraof.minestuck.util.CustomVoxelShape;
+import com.mraof.minestuck.block.CustomVoxelShape;
 import net.minecraft.core.Direction;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.block.Block;
@@ -83,4 +83,4 @@ public static <K extends Enum<K>, V> Map<K, V> createEnumMapping(Class<K> c, K[]
 		}
 		return Maps.immutableEnumMap(map);
 	}
-}
+}

src/main/java/com/mraof/minestuck/block/machine/PunchDesignixBlock.java

@@ -1,8 +1,8 @@
 package com.mraof.minestuck.block.machine;
 
+import com.mraof.minestuck.block.CustomVoxelShape;
 import com.mraof.minestuck.block.MSProperties;
 import com.mraof.minestuck.blockentity.machine.PunchDesignixBlockEntity;
-import com.mraof.minestuck.util.CustomVoxelShape;
 import com.mraof.minestuck.util.MSRotationUtil;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
@@ -128,4 +128,4 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state)
 			return new PunchDesignixBlockEntity(pos, state);
 		}
 	}
-}
+}

src/main/java/com/mraof/minestuck/block/machine/TotemLatheBlock.java

@@ -1,13 +1,13 @@
 package com.mraof.minestuck.block.machine;
 
 import com.mraof.minestuck.block.BlockUtil;
+import com.mraof.minestuck.block.CustomVoxelShape;
 import com.mraof.minestuck.block.EnumDowelType;
 import com.mraof.minestuck.block.MSProperties;
 import com.mraof.minestuck.blockentity.ItemStackBlockEntity;
 import com.mraof.minestuck.blockentity.MSBlockEntityTypes;
 import com.mraof.minestuck.blockentity.machine.TotemLatheBlockEntity;
 import com.mraof.minestuck.blockentity.machine.TotemLatheDowelBlockEntity;
-import com.mraof.minestuck.util.CustomVoxelShape;
 import com.mraof.minestuck.util.MSRotationUtil;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
@@ -227,4 +227,4 @@ public void onRemove(BlockState state, Level level, BlockPos pos, BlockState new
 			super.onRemove(state, level, pos, newState, isMoving);
 		}
 	}
-}
+}

src/main/java/com/mraof/minestuck/block/redstone/ItemMagnetBlock.java

@@ -1,12 +1,12 @@
 package com.mraof.minestuck.block.redstone;
 
 import com.mraof.minestuck.block.BlockUtil;
+import com.mraof.minestuck.block.CustomVoxelShape;
 import com.mraof.minestuck.block.DirectionalCustomShapeBlock;
 import com.mraof.minestuck.block.MSProperties;
 import com.mraof.minestuck.blockentity.MSBlockEntityTypes;
 import com.mraof.minestuck.blockentity.redstone.ItemMagnetBlockEntity;
 import com.mraof.minestuck.effects.CreativeShockEffect;
-import com.mraof.minestuck.util.CustomVoxelShape;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.particles.DustParticleOptions;
@@ -121,4 +121,4 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
 		builder.add(POWER);
 		builder.add(REVERSE_POLARITY);
 	}
-}
+}

src/main/java/com/mraof/minestuck/blockentity/ComputerBlockEntity.java

@@ -8,10 +8,10 @@
 import com.mraof.minestuck.computer.ProgramData;
 import com.mraof.minestuck.computer.editmode.ServerEditHandler;
 import com.mraof.minestuck.computer.theme.MSComputerThemes;
+import com.mraof.minestuck.item.IncompleteSburbCodeItem;
 import com.mraof.minestuck.player.IdentifierHandler;
 import com.mraof.minestuck.player.PlayerIdentifier;
 import com.mraof.minestuck.skaianet.SburbConnections;
-import com.mraof.minestuck.util.MSNBTUtil;
 import com.mraof.minestuck.util.MSTags;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
@@ -104,7 +104,7 @@ public void load(CompoundTag nbt)
 		else if(nbt.contains("theme", Tag.TAG_INT))
 			computerTheme = MSComputerThemes.getThemeFromOldOrdinal(nbt.getInt("theme"));
 
-		hieroglyphsStored = MSNBTUtil.readBlockSet(nbt, "hieroglyphsStored");
+		hieroglyphsStored = IncompleteSburbCodeItem.readBlockSet(nbt, "hieroglyphsStored");
 		if(nbt.contains("hasParadoxInfoStored"))
 			hasParadoxInfoStored = nbt.getBoolean("hasParadoxInfoStored");
 		if(nbt.contains("blankDisksStored"))
@@ -134,7 +134,7 @@ public void saveAdditional(CompoundTag compound)
 		if(owner != null)
 			owner.saveToNBT(compound, "owner");
 
-		MSNBTUtil.writeBlockSet(compound, "hieroglyphsStored", hieroglyphsStored);
+		IncompleteSburbCodeItem.writeBlockSet(compound, "hieroglyphsStored", hieroglyphsStored);
 		compound.putBoolean("hasParadoxInfoStored", hasParadoxInfoStored);
 
 		compound.putInt("blankDisksStored", blankDisksStored);