Port to 1.16.5

.gitignore

@@ -14,7 +14,6 @@ out
 !.idea/kotlinc.xml
 !.idea/statistic.xml
 !.idea/vcs.xml
-!.idea/shelf
 
 # eclipse
 bin

.idea/misc.xml

@@ -45,7 +45,7 @@
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="13">
+        <list size="14">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@@ -59,6 +59,7 @@
           <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
           <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
           <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="lombok.NonNull" />
         </list>
       </value>
     </option>
@@ -66,4 +67,7 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 DCEVM" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/bin" />
   </component>
+  <component name="SuppressKotlinCodeStyleNotification">
+    <option name="disableForAll" value="true" />
+  </component>
 </project>

.idea/shelf/Datagen_Recipes.xml

@@ -1,4 +0,0 @@
-<changelist name="Datagen_Recipes" date="1601734824200" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Datagen_Recipes/shelved.patch" />
-  <option name="DESCRIPTION" value="Datagen Recipes" />
-</changelist>

.idea/shelf/Datagen_Recipes/shelved.patch

@@ -1,79 +0,0 @@
-Index: data/src/main/java/chylex/hee/datagen/DataGen.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>package chylex.hee.datagen\nimport chylex.hee.HEE\nimport chylex.hee.datagen.client.BlockItemModels\nimport chylex.hee.datagen.client.BlockModels\nimport chylex.hee.datagen.client.BlockStates\nimport chylex.hee.datagen.client.ItemModels\nimport chylex.hee.system.forge.SubscribeAllEvents\nimport chylex.hee.system.forge.SubscribeEvent\nimport net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus.MOD\nimport net.minecraftforge.fml.event.lifecycle.GatherDataEvent\n\n@SubscribeAllEvents(modid = HEE.ID, bus = MOD)\nobject DataGen{\n\t@SubscribeEvent\n\tfun register(e: GatherDataEvent){\n\t\tval modid = HEE.ID\n\t\tval helper = e.existingFileHelper\n\t\t\n\t\twith(e.generator){\n\t\t\tif (e.includeClient()){\n\t\t\t\taddProvider(BlockStates(this, modid, helper))\n\t\t\t\taddProvider(BlockModels(this, modid, helper))\n\t\t\t\taddProvider(BlockItemModels(this, modid, helper))\n\t\t\t\taddProvider(ItemModels(this, modid, helper))\n\t\t\t}\n\t\t}\n\t}\n}\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- a/data/src/main/java/chylex/hee/datagen/DataGen.kt	(revision f8888e0a3b33898551301124a0879cea12fc1f06)
-+++ b/data/src/main/java/chylex/hee/datagen/DataGen.kt	(date 1601732788951)
-@@ -4,6 +4,7 @@
- import chylex.hee.datagen.client.BlockModels
- import chylex.hee.datagen.client.BlockStates
- import chylex.hee.datagen.client.ItemModels
-+import chylex.hee.datagen.server.Recipes
- import chylex.hee.system.forge.SubscribeAllEvents
- import chylex.hee.system.forge.SubscribeEvent
- import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus.MOD
-@@ -23,6 +24,10 @@
- 				addProvider(BlockItemModels(this, modid, helper))
- 				addProvider(ItemModels(this, modid, helper))
- 			}
-+			
-+			if (e.includeServer()){
-+				addProvider(Recipes(this))
-+			}
- 		}
- 	}
- }
-Index: data/src/main/java/chylex/hee/datagen/server/Recipes.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- /dev/null	(date 1601733265753)
-+++ b/data/src/main/java/chylex/hee/datagen/server/Recipes.kt	(date 1601733265753)
-@@ -0,0 +1,15 @@
-+package chylex.hee.datagen.server
-+import chylex.hee.datagen.server.util.ingredients
-+import chylex.hee.datagen.server.util.shapeless
-+import chylex.hee.init.ModItems
-+import net.minecraft.data.DataGenerator
-+import net.minecraft.data.IFinishedRecipe
-+import net.minecraft.data.RecipeProvider
-+import net.minecraft.item.Items
-+import java.util.function.Consumer
-+
-+class Recipes(generator: DataGenerator) : RecipeProvider(generator){
-+	override fun registerRecipes(consumer: Consumer<IFinishedRecipe>) = with(consumer){
-+		shapeless(ModItems.ALTERATION_NEXUS, 1){ ingredients(Items.DIAMOND, Items.ENDER_EYE, ModItems.ANCIENT_DUST, ModItems.ETHEREUM) }
-+	}
-+}
-Index: data/src/main/java/chylex/hee/datagen/server/util/RecipeProviderExt.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- /dev/null	(date 1601733249382)
-+++ b/data/src/main/java/chylex/hee/datagen/server/util/RecipeProviderExt.kt	(date 1601733249382)
-@@ -0,0 +1,20 @@
-+package chylex.hee.datagen.server.util
-+import net.minecraft.data.IFinishedRecipe
-+import net.minecraft.data.ShapedRecipeBuilder
-+import net.minecraft.data.ShapelessRecipeBuilder
-+import net.minecraft.util.IItemProvider
-+import java.util.function.Consumer
-+
-+fun Consumer<IFinishedRecipe>.shaped(result: IItemProvider, amount: Int, callback: ShapedRecipeBuilder.() -> Unit){
-+	ShapedRecipeBuilder(result, amount).apply(callback).build(this)
-+}
-+
-+fun Consumer<IFinishedRecipe>.shapeless(result: IItemProvider, amount: Int, callback: ShapelessRecipeBuilder.() -> Unit){
-+	ShapelessRecipeBuilder(result, amount).apply(callback).build(this)
-+}
-+
-+fun ShapelessRecipeBuilder.ingredients(vararg ingredients: IItemProvider){
-+	for(ingredient in ingredients){
-+		this.addIngredient(ingredient)
-+	}
-+}

.idea/shelf/Development3.xml

@@ -1,4 +0,0 @@
-<changelist name="Development3" date="1601983889370" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Development3/shelved.patch" />
-  <option name="DESCRIPTION" value="Development" />
-</changelist>

.idea/shelf/Dust.xml

@@ -1,4 +0,0 @@
-<changelist name="Dust" date="1590783410567" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Dust/shelved.patch" />
-  <option name="DESCRIPTION" value="Dust" />
-</changelist>

.idea/shelf/EnderEyeAttack_kt.xml

@@ -1,4 +0,0 @@
-<changelist name="EnderEyeAttack_kt" date="1601761992769" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/EnderEyeAttack_kt/shelved.patch" />
-  <option name="DESCRIPTION" value="EnderEyeAttack.kt" />
-</changelist>

.idea/shelf/Ender_Eye.xml

@@ -1,4 +0,0 @@
-<changelist name="Ender_Eye" date="1595119986895" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Ender_Eye/shelved.patch" />
-  <option name="DESCRIPTION" value="Ender Eye" />
-</changelist>

.idea/shelf/Ender_Eye_Stuff.xml

@@ -1,4 +0,0 @@
-<changelist name="Ender_Eye_Stuff" date="1601351827334" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Ender_Eye_Stuff/shelved.patch" />
-  <option name="DESCRIPTION" value="Ender Eye Stuff" />
-</changelist>

.idea/shelf/Eye.xml

@@ -1,4 +0,0 @@
-<changelist name="Eye" date="1605472809585" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Eye/shelved.patch" />
-  <option name="DESCRIPTION" value="Eye" />
-</changelist>

.idea/shelf/Ideas.xml

@@ -1,4 +0,0 @@
-<changelist name="Ideas" date="1595089578362" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Ideas/shelved.patch" />
-  <option name="DESCRIPTION" value="Ideas" />
-</changelist>

.idea/shelf/Later.xml

@@ -1,4 +0,0 @@
-<changelist name="Later" date="1579750352473" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Later/shelved.patch" />
-  <option name="DESCRIPTION" value="Later" />
-</changelist>

.idea/shelf/Later1.xml

@@ -1,4 +0,0 @@
-<changelist name="Later1" date="1607753523089" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Later1/shelved.patch" />
-  <option name="DESCRIPTION" value="Later" />
-</changelist>

.idea/shelf/Later2.xml

@@ -1,4 +0,0 @@
-<changelist name="Later2" date="1610732422264" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Later2/shelved.patch" />
-  <option name="DESCRIPTION" value="Later" />
-</changelist>

.idea/shelf/Later2/shelved.patch

@@ -1,19 +0,0 @@
-Index: src/system/src/main/java/chylex/hee/game/entity/EntitySelector.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>package chylex.hee.game.entity\n\nimport chylex.hee.system.math.square\nimport net.minecraft.entity.Entity\nimport net.minecraft.util.math.AxisAlignedBB\nimport net.minecraft.util.math.Vec3d\nimport net.minecraft.world.IEntityReader\nimport java.util.function.Predicate\n\n@Suppress(\"NOTHING_TO_INLINE\")\nclass EntitySelector(private val world: IEntityReader, private val predicate: Predicate<in Entity>) {\n\tfun <T : Entity> inBox(cls: Class<T>, aabb: AxisAlignedBB): List<T> {\n\t\treturn world.getEntitiesWithinAABB(cls, aabb, predicate)\n\t}\n\t\n\tfun <T : Entity> inRange(cls: Class<T>, point: Vec3d, range: Double): List<T> {\n\t\tval aabb = AxisAlignedBB(point.x - range, point.y - range, point.z - range, point.x + range, point.y + range, point.z + range)\n\t\tval rangeSq = square(range)\n\t\t\n\t\treturn world.getEntitiesWithinAABB(cls, aabb) { predicate.test(it) && it!!.posVec.squareDistanceTo(point) <= rangeSq }\n\t}\n\t\n\t// Reified\n\t\n\tinline fun <reified T : Entity> inBox(aabb: AxisAlignedBB) = inBox(T::class.java, aabb)\n\tinline fun <reified T : Entity> inRange(point: Vec3d, range: Double) = inRange(T::class.java, point, range)\n\t\n\t// General\n\t\n\tinline fun allInBox(aabb: AxisAlignedBB) = inBox(Entity::class.java, aabb)\n\tinline fun allInRange(point: Vec3d, range: Double) = inRange(Entity::class.java, point, range)\n}\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/system/src/main/java/chylex/hee/game/entity/EntitySelector.kt b/src/system/src/main/java/chylex/hee/game/entity/EntitySelector.kt
---- a/src/system/src/main/java/chylex/hee/game/entity/EntitySelector.kt	(revision 276df769798cbd4fd8154c5ebca0001dd8639545)
-+++ b/src/system/src/main/java/chylex/hee/game/entity/EntitySelector.kt	(date 1609259090000)
-@@ -20,6 +20,8 @@
- 		return world.getEntitiesWithinAABB(cls, aabb) { predicate.test(it) && it!!.posVec.squareDistanceTo(point) <= rangeSq }
- 	}
- 	
-+	// TODO only loaded? fuck
-+	
- 	// Reified
- 	
- 	inline fun <reified T : Entity> inBox(aabb: AxisAlignedBB) = inBox(T::class.java, aabb)

.idea/shelf/Recipe_Datagen.xml

@@ -1,4 +0,0 @@
-<changelist name="Recipe_Datagen" date="1601740449134" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Recipe_Datagen/shelved.patch" />
-  <option name="DESCRIPTION" value="Recipe Datagen" />
-</changelist>

.idea/shelf/Recipe_Datagen/shelved.patch

@@ -1,47 +0,0 @@
-Index: data/src/main/java/chylex/hee/datagen/server/Recipes.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- /dev/null	(date 1601740133630)
-+++ b/data/src/main/java/chylex/hee/datagen/server/Recipes.kt	(date 1601740133630)
-@@ -0,0 +1,11 @@
-+package chylex.hee.datagen.server
-+import net.minecraft.data.DataGenerator
-+import net.minecraft.data.IFinishedRecipe
-+import net.minecraft.data.RecipeProvider
-+import java.util.function.Consumer
-+
-+class Recipes(generator: DataGenerator) : RecipeProvider(generator){
-+	override fun registerRecipes(consumer: Consumer<IFinishedRecipe>) = with(consumer){
-+		// shapeless(ModItems.ALTERATION_NEXUS, 1){ ingredients(Items.DIAMOND, Items.ENDER_EYE, ModItems.ANCIENT_DUST, ModItems.ETHEREUM) }
-+	}
-+}
-Index: data/src/main/java/chylex/hee/datagen/server/util/RecipeProviderExt.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- /dev/null	(date 1601734823610)
-+++ b/data/src/main/java/chylex/hee/datagen/server/util/RecipeProviderExt.kt	(date 1601734823610)
-@@ -0,0 +1,20 @@
-+package chylex.hee.datagen.server.util
-+import net.minecraft.data.IFinishedRecipe
-+import net.minecraft.data.ShapedRecipeBuilder
-+import net.minecraft.data.ShapelessRecipeBuilder
-+import net.minecraft.util.IItemProvider
-+import java.util.function.Consumer
-+
-+fun Consumer<IFinishedRecipe>.shaped(result: IItemProvider, amount: Int, callback: ShapedRecipeBuilder.() -> Unit){
-+	ShapedRecipeBuilder(result, amount).apply(callback).build(this)
-+}
-+
-+fun Consumer<IFinishedRecipe>.shapeless(result: IItemProvider, amount: Int, callback: ShapelessRecipeBuilder.() -> Unit){
-+	ShapelessRecipeBuilder(result, amount).apply(callback).build(this)
-+}
-+
-+fun ShapelessRecipeBuilder.ingredients(vararg ingredients: IItemProvider){
-+	for(ingredient in ingredients){
-+		this.addIngredient(ingredient)
-+	}
-+}

.idea/shelf/Shulker_Box_Animation.xml

@@ -1,4 +0,0 @@
-<changelist name="Shulker_Box_Animation" date="1590248312609" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Shulker_Box_Animation/shelved.patch" />
-  <option name="DESCRIPTION" value="Shulker Box Animation" />
-</changelist>

.idea/shelf/StructureFile.xml

@@ -1,4 +0,0 @@
-<changelist name="StructureFile" date="1601888541958" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/StructureFile/shelved.patch" />
-  <option name="DESCRIPTION" value="StructureFile" />
-</changelist>

.idea/shelf/TODO.xml

@@ -1,4 +0,0 @@
-<changelist name="TODO" date="1601072216412" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/TODO/shelved.patch" />
-  <option name="DESCRIPTION" value="TODO" />
-</changelist>

.idea/shelf/Territories.xml

@@ -1,14 +0,0 @@
-<changelist name="Territories" date="1593174807954" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Territories/shelved.patch" />
-  <option name="DESCRIPTION" value="Territories" />
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="src/main/resources/assets/hee/textures/environment/end_sky_blurry.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Territories/end_sky_blurry.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="src/main/resources/assets/hee/textures/environment/end_sky_smooth.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Territories/end_sky_smooth.png" />
-  </binary>
-</changelist>

.idea/shelf/Territories/shelved.patch

@@ -1,24 +0,0 @@
-Index: src/main/java/chylex/hee/game/block/BlockDustyStoneUnstable.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- a/src/main/java/chylex/hee/game/block/BlockDustyStoneUnstable.kt	(revision f6f631f6f3dc9b347b19db913cf2be4535813fc7)
-+++ b/src/main/java/chylex/hee/game/block/BlockDustyStoneUnstable.kt	(date 1590584304217)
-@@ -26,7 +26,6 @@
- import net.minecraft.util.math.shapes.EntitySelectionContext
- import net.minecraft.util.math.shapes.ISelectionContext
- import net.minecraft.util.math.shapes.VoxelShape
--import net.minecraft.util.math.shapes.VoxelShapes
- import net.minecraft.world.IBlockReader
- import net.minecraft.world.World
- import java.util.Random
-@@ -68,7 +67,7 @@
- 		return if (context is EntitySelectionContext && context.entity is EntityLivingBase)
- 			MagicValues.BLOCK_COLLISION_SHRINK_SHAPE
- 		else
--			VoxelShapes.fullCube()
-+			MagicValues.BLOCK_COLLISION_SHRINK_SHAPE //VoxelShapes.fullCube()
- 	}
- 	
- 	override fun causesSuffocation(state: BlockState, world: IBlockReader, pos: BlockPos): Boolean{

.idea/shelf/Work_on_Ender_Eye_spawn_animation__movement__and_attack_logic.xml

@@ -1,4 +0,0 @@
-<changelist name="Work_on_Ender_Eye_spawn_animation,_movement,_and_attack_logic" date="1601092950910" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Work_on_Ender_Eye_spawn_animation,_movement,_and_attack_logic/shelved.patch" />
-  <option name="DESCRIPTION" value="Work on Ender Eye spawn animation, movement, and attack logic" />
-</changelist>

.idea/shelf/thing.xml

@@ -1,4 +0,0 @@
-<changelist name="thing" date="1608060366436" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/thing/shelved.patch" />
-  <option name="DESCRIPTION" value="thing" />
-</changelist>

.idea/shelf/thing/shelved.patch

@@ -1,74 +0,0 @@
-Index: src/main/resources/hee.mixins.json
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>{\n  \"required\": true,\n  \"minVersion\": \"0.8\",\n  \"package\": \"chylex.hee.mixin\",\n  \"compatibilityLevel\": \"JAVA_8\",\n  \"mixins\": [\n    \"HookAnvilRepair\",\n    \"HookBlockDrops\",\n    \"HookChorusFlowerSoil\",\n    \"HookChorusPlantSoil\",\n    \"HookEffectCorruption\",\n    \"HookEffectInstanceCorruption\",\n    \"HookEndBiome\",\n    \"HookEndermanParticles\",\n    \"HookEndermiteParticles\",\n    \"HookEntityHelmetBreaking\",\n    \"HookEntityPotionCorruption\",\n    \"HookFireSpread\",\n    \"HookItemEntityLavaCheck\",\n    \"HookLightMapColors\",\n    \"HookPlayerInventoryArmorBreaking\",\n    \"HookPotionCreativeMenu\",\n    \"HookThornsArmorBreaking\"\n  ],\n  \"injectors\": {\n    \"defaultRequire\": 1\n  }\n}\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/main/resources/hee.mixins.json b/src/main/resources/hee.mixins.json
---- a/src/main/resources/hee.mixins.json	(revision 7f9202bceb9aa7b8fac24437a2190a87857573a7)
-+++ b/src/main/resources/hee.mixins.json	(date 1608060366293)
-@@ -3,25 +3,7 @@
-   "minVersion": "0.8",
-   "package": "chylex.hee.mixin",
-   "compatibilityLevel": "JAVA_8",
--  "mixins": [
--    "HookAnvilRepair",
--    "HookBlockDrops",
--    "HookChorusFlowerSoil",
--    "HookChorusPlantSoil",
--    "HookEffectCorruption",
--    "HookEffectInstanceCorruption",
--    "HookEndBiome",
--    "HookEndermanParticles",
--    "HookEndermiteParticles",
--    "HookEntityHelmetBreaking",
--    "HookEntityPotionCorruption",
--    "HookFireSpread",
--    "HookItemEntityLavaCheck",
--    "HookLightMapColors",
--    "HookPlayerInventoryArmorBreaking",
--    "HookPotionCreativeMenu",
--    "HookThornsArmorBreaking"
--  ],
-+  "mixins": [ "HookAnvilRepair", "HookBlockDrops", "HookChorusFlowerSoil", "HookChorusPlantSoil", "HookEffectCorruption", "HookEffectInstanceCorruption", "HookElytraBreaking", "HookEndBiome", "HookEndermanParticles", "HookEndermiteParticles", "HookEntityHelmetBreaking", "HookEntityPotionCorruption", "HookFireSpread", "HookItemEntityLavaCheck", "HookLightMapColors", "HookPlayerInventoryArmorBreaking", "HookPotionCreativeMenu", "HookThornsArmorBreaking" ],
-   "injectors": {
-     "defaultRequire": 1
-   }
-Index: src/main/java/chylex/hee/mixin/HookElytraBreaking.java
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/main/java/chylex/hee/mixin/HookElytraBreaking.java b/src/main/java/chylex/hee/mixin/HookElytraBreaking.java
-new file mode 100644
---- /dev/null	(date 1608060322378)
-+++ b/src/main/java/chylex/hee/mixin/HookElytraBreaking.java	(date 1608060322378)
-@@ -0,0 +1,27 @@
-+package chylex.hee.mixin;
-+
-+import chylex.hee.init.ModItems;
-+import net.minecraft.entity.LivingEntity;
-+import net.minecraft.entity.player.PlayerEntity;
-+import net.minecraft.item.ElytraItem;
-+import net.minecraft.item.ItemStack;
-+import org.spongepowered.asm.mixin.Mixin;
-+import org.spongepowered.asm.mixin.injection.At;
-+import org.spongepowered.asm.mixin.injection.Redirect;
-+import java.util.function.Consumer;
-+
-+@Mixin(ElytraItem.class)
-+public abstract class HookElytraBreaking{
-+	@Redirect(
-+		method = "elytraFlightTick",
-+		at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;damageItem(ILnet/minecraft/entity/LivingEntity;Ljava/util/function/Consumer;)V")
-+	)
-+	public void damageItem(final ItemStack stack, final int amount, final LivingEntity entity, final Consumer<LivingEntity> onBroken){
-+		final ItemStack originalStack = stack.copy();
-+		stack.damageItem(amount, entity, onBroken);
-+		
-+		if (ElytraItem.isUsable(originalStack) && !ElytraItem.isUsable(stack) && entity instanceof PlayerEntity){
-+			ModItems.RING_OF_PRESERVATION.onArmorDestroyed((PlayerEntity)entity, originalStack, stack);
-+		}
-+	}
-+}

.idea/shelf/todo1.xml

@@ -1,4 +0,0 @@
-<changelist name="todo1" date="1601711471885" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/todo1/shelved.patch" />
-  <option name="DESCRIPTION" value="todo" />
-</changelist>

build.gradle

@@ -1,29 +1,26 @@
 ext {
-	mc_version = "1.15.2"
-	forge_version = "31.2.45"
-	mapping_version = "20200626-1.15.1"
-	kotlin_mod_version = "1.6.1"
+	mc_version = "1.16.5"
+	forge_version = "36.1.32"
+	mixin_version = "0.8.2"
+	mapping_version = "20210309-1.16.5"
+	kotlin_mod_version = "1.13.0"
 }
 
 buildscript {
 	ext {
-		kotlin_version = "1.4.10"
+		kotlin_version = "1.5.20"
 	}
 	
 	repositories {
-		jcenter()
 		mavenCentral()
 		maven { url = "https://files.minecraftforge.net/maven" }
-		maven { url = "https://dist.creeper.host/Sponge/maven" }
+		maven { url = "https://repo.spongepowered.org/maven" }
 	}
 	
 	dependencies {
-		classpath(group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "3.+", changing: true) {
-			exclude group: "trove", module: "trove"
-		}
-		
-		classpath "org.spongepowered:mixingradle:0.7-SNAPSHOT"
-		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:" + kotlin_version
+		classpath group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "4.1.+", changing: true
+		classpath group: "org.spongepowered", name: "mixingradle", version: "0.7-SNAPSHOT"
+		classpath group: "org.jetbrains.kotlin", name: "kotlin-gradle-plugin", version: kotlin_version
 	}
 }
 
@@ -75,14 +72,14 @@ allprojects {
 	tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
 		kotlinOptions {
 			jvmTarget = "1.8"
-			apiVersion = "1.4"
-			languageVersion = "1.4"
+			apiVersion = "1.5"
+			languageVersion = "1.5"
+			useIR = true
 			freeCompilerArgs = [
 				"-Xno-call-assertions",
 				"-Xno-param-assertions",
 				"-Xno-receiver-assertions",
 				"-Xjvm-default=all",
-				"-Xuse-experimental=kotlin.ExperimentalUnsignedTypes",
 				"-Xuse-experimental=kotlin.contracts.ExperimentalContracts",
 				"-XXLanguage:+InlineClasses"
 			]
@@ -92,7 +89,7 @@ allprojects {
 	repositories {
 		maven {
 			name = "kotlinforforge"
-			url = "https://thedarkcolour.github.io/KotlinForForge/"
+			url = "https://thedarkcolour.github.io/KotlinForForge"
 		}
 	}
 	
@@ -124,7 +121,8 @@ minecraft {
 	runs {
 		client {
 			property "hee.debug", ""
-			property "mixin.env.disableRefMap", "true"
+			property "mixin.env.remapRefMap", "true"
+			property "mixin.env.refMapRemappingFile", "${projectDir}/build/createSrgToMcp/output.srg"
 			arg "-mixin.config=hee.mixins.json"
 			
 			workingDirectory file("run")
@@ -139,7 +137,8 @@ minecraft {
 		
 		server {
 			property "hee.debug", ""
-			property "mixin.env.disableRefMap", "true"
+			property "mixin.env.remapRefMap", "true"
+			property "mixin.env.refMapRemappingFile", "${projectDir}/build/createSrgToMcp/output.srg"
 			arg "-mixin.config=hee.mixins.json"
 			
 			workingDirectory file("run")
@@ -172,13 +171,23 @@ minecraft {
 	}
 }
 
+mixin {
+	add sourceSets.main, "hee.refmap.json"
+}
+
 dependencies {
 	minecraft "net.minecraftforge:forge:" + mc_version + "-" + forge_version
-	implementation "thedarkcolour:kotlinforforge:" + kotlin_mod_version
-	implementation project(":system")
 	
-	testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.0-RC1"
+	implementation project(":system")
+	implementation "thedarkcolour:kotlinforforge:" + kotlin_mod_version
+	
 	testImplementation project(":system")
+	testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.0-RC1"
+	
+	if (System.getProperty("idea.sync.active") != "true") {
+		annotationProcessor "org.spongepowered:mixin:" + mixin_version + ":processor"
+		testAnnotationProcessor "org.spongepowered:mixin:" + mixin_version + ":processor"
+	}
 }
 
 test {
@@ -190,6 +199,7 @@ jar {
 	
 	from(project(":system").sourceSets.main.output) {
 		exclude "META-INF"
+		exclude "pack.mcmeta"
 	}
 	
 	from("./data/gen") {

data/build.gradle

@@ -1,29 +1,18 @@
 buildscript {
 	repositories {
-		jcenter()
 		mavenCentral()
-		
-		maven {
-			url = "https://files.minecraftforge.net/maven"
-		}
+		maven { url = "https://files.minecraftforge.net/maven" }
 	}
 	
 	dependencies {
-		classpath(group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "3.+", changing: true) {
-			exclude group: "trove", module: "trove"
-		}
-		
-		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:" + kotlin_version
+		classpath group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "4.1.+", changing: true
+		classpath group: "org.jetbrains.kotlin", name: "kotlin-gradle-plugin", version: kotlin_version
 	}
 }
 
 repositories {
-	jcenter()
 	mavenCentral()
-	
-	maven {
-		url = "https://files.minecraftforge.net/maven"
-	}
+	maven { url = "https://files.minecraftforge.net/maven" }
 }
 
 apply plugin: "net.minecraftforge.gradle"

data/gen/.cache/cache

@@ -68,13 +68,13 @@ fab8e5adbe78c08a8d9837d2317192346bafb45d assets/hee/blockstates/infusion_table_t
 5d5f59f893a34e8e616abdbdc8567906ae021f99 assets/hee/blockstates/miners_burial_altar.json
 922f1005c22e55c329ef56039224717b2dc4c55b assets/hee/blockstates/miners_burial_block_chiseled.json
 c16b5933b9af8fb1033c6d6d11e19628d7c56f4f assets/hee/blockstates/miners_burial_block_jail.json
-45c8146f5aaf0e59384e5afeabc72ff3a6a23779 assets/hee/blockstates/miners_burial_block_pillar.json
+975d93d65c5bda712418d8df48f6e0f630103621 assets/hee/blockstates/miners_burial_block_pillar.json
 b58fb5ca5bdaf639f725135a2a6682adc4c712ff assets/hee/blockstates/miners_burial_block_plain.json
 4c56ed06867c9ef95b287b57e31ddb123e56020e assets/hee/blockstates/obsidian_chiseled.json
 4c56ed06867c9ef95b287b57e31ddb123e56020e assets/hee/blockstates/obsidian_chiseled_lit.json
 58196b68181ce4554fe7accaa29d3f1f2596b3c2 assets/hee/blockstates/obsidian_falling.json
-36abdff17a5a19d1bb2d7d496305ce402b26a3c6 assets/hee/blockstates/obsidian_pillar.json
-36abdff17a5a19d1bb2d7d496305ce402b26a3c6 assets/hee/blockstates/obsidian_pillar_lit.json
+d4bc138bf24df55f5df0df391cced6c587e6fec3 assets/hee/blockstates/obsidian_pillar.json
+d666add54a950dd814fc08a7e612ac5a57070c15 assets/hee/blockstates/obsidian_pillar_lit.json
 3c6eb037eb8731410f06b17815e9b9d3705c6b7f assets/hee/blockstates/obsidian_smooth.json
 3c6eb037eb8731410f06b17815e9b9d3705c6b7f assets/hee/blockstates/obsidian_smooth_lit.json
 b8b99433b93d082fafdddcbf8028802fb91ec72e assets/hee/blockstates/obsidian_stairs.json
@@ -99,139 +99,143 @@ cdec448668f4779142ce0d53ca8b225b16bbf6bc assets/hee/blockstates/void_portal_fram
 3cfceb3e6ab5611c49f8922397fc407e67f80abf assets/hee/blockstates/void_portal_storage.json
 c389eedbbe42d28f5ceea56b48c89b67ce4e1afa assets/hee/blockstates/void_portal_storage_crafted.json
 4cfe2854f9a07843b5c81941ffa2c5dc09d71a17 assets/hee/blockstates/whitebark.json
-249a4cebff92532cc7a7cb4d54d5db8cfdebc771 assets/hee/blockstates/whitebark_log.json
+c53b83ef3e8152ed65147117c10122e4906ea61b assets/hee/blockstates/whitebark_log.json
 281264d279f075947ee2f8afdb78190364782921 assets/hee/blockstates/whitebark_planks.json
 976d2b47d52e04eb9944e3c4c8aee9a91f315ade assets/hee/blockstates/whitebark_slab.json
 776dd79a096f999f2606047486af73aca71a6cf0 assets/hee/blockstates/whitebark_stairs.json
 a3127926cde114f660a9748f9d2ff6c378778d6a assets/hee/models/block/accumulation_table_tier_1.json
 c87320b92ede3bf18f7497cf59689d15ef18969b assets/hee/models/block/accumulation_table_tier_2.json
 0adc1ddee430fc2aacd2b6a32fbc1fea048345c2 assets/hee/models/block/accumulation_table_tier_3.json
-f5a0ce0b1552b59fbd585d82ad7dc22f2e4f7202 assets/hee/models/block/ancient_cobweb.json
-85f08c6a03ff2355552e3d23c34ba4950ee715c0 assets/hee/models/block/autumn_leaves_brown.json
-73690d671b7588e736be5747e395cda0b05681d0 assets/hee/models/block/autumn_leaves_orange.json
-a7681a39143ebd00e76c52e04102ec6d0ef49996 assets/hee/models/block/autumn_leaves_red.json
-b9921617ab7299304e5a62126f0e3cb3ba387d10 assets/hee/models/block/autumn_leaves_yellowgreen.json
-527d0b22cb75b9b5f6064cfbea82cf9b0e6f5bee assets/hee/models/block/autumn_sapling_brown.json
-3a89a6b4d7353148a740dbafe27f2d1af3b508ed assets/hee/models/block/autumn_sapling_orange.json
-36cea0264aa43b3ca8a6c1b6356ad4f9d1f30f8f assets/hee/models/block/autumn_sapling_red.json
-309230ae789305f68680e6a3952e5b0080ab2cf8 assets/hee/models/block/autumn_sapling_yellowgreen.json
-57a8082130798e045d905406ba36c88b7aa25c4b assets/hee/models/block/cauldron_dragons_breath_level1.json
-95d97030b8ed0b4a68b5c4d110bddd782b0e1f24 assets/hee/models/block/cauldron_dragons_breath_level2.json
-4ec96e37017f5b2d37c0043fc2777210c56887d8 assets/hee/models/block/cauldron_dragons_breath_level3.json
-f343686bf0a9923c8cbb247bcc69f8a190763504 assets/hee/models/block/cauldron_ender_goo_level1.json
-08c6586789b11eefb3e660407851869eeebfcce0 assets/hee/models/block/cauldron_ender_goo_level2.json
-14b18e57ab3afee889cca25b5f76a6b9b487a974 assets/hee/models/block/cauldron_ender_goo_level3.json
-59a64b517e41241d1744005f2a003af7f661e209 assets/hee/models/block/cauldron_purified_ender_goo_level1.json
-de38ac2f4222080a706bb22235b8d07a592db296 assets/hee/models/block/cauldron_purified_ender_goo_level2.json
-f47dd5e887771067a2a5383ce46aa311bd95f90c assets/hee/models/block/cauldron_purified_ender_goo_level3.json
-8eec038e2ef5a9ec058f4990e1e3b361570548d5 assets/hee/models/block/corrupted_energy.json
+acd3fdaf2b4b2ee86d0257189a65a65651ba1415 assets/hee/models/block/ancient_cobweb.json
+8567b6e95994e216f2ada66af4532a020f985605 assets/hee/models/block/autumn_leaves_brown.json
+168e4ff9a87fee173e5ee1d1e1d76c3918fac034 assets/hee/models/block/autumn_leaves_orange.json
+e90b875bcde4811bf4d30daf1572066619a70ea6 assets/hee/models/block/autumn_leaves_red.json
+84b58953fa9aeb394cc414196bf91be01f751d88 assets/hee/models/block/autumn_leaves_yellowgreen.json
+6f8a57a4ef3de8bd3ddbdd61091e49b59cbde2d6 assets/hee/models/block/autumn_sapling_brown.json
+c63c076101d47613873062235a8d7f684e45f462 assets/hee/models/block/autumn_sapling_orange.json
+dfefb04fc5683747243900278438c60d18d9b911 assets/hee/models/block/autumn_sapling_red.json
+446dcc26ce0a5d996b53a1c9651f71a29e72afa2 assets/hee/models/block/autumn_sapling_yellowgreen.json
+1ca0c60f19fa35cb3e2becf18e148abe9a5bbe02 assets/hee/models/block/cauldron_dragons_breath_level1.json
+8aae6b914bdaeffa4005a5ee7d5882b56b7cadb0 assets/hee/models/block/cauldron_dragons_breath_level2.json
+1f602f9665501a5166e1e2b3e83c69f67d197c24 assets/hee/models/block/cauldron_dragons_breath_level3.json
+91330f97cec8c38cd436f78ea2fddc0e55ec8563 assets/hee/models/block/cauldron_ender_goo_level1.json
+aca5727e505bc3faa9042e96e5eec3e654449c61 assets/hee/models/block/cauldron_ender_goo_level2.json
+aeaa592eb27746b48324dc0d1c21e7032c749b43 assets/hee/models/block/cauldron_ender_goo_level3.json
+8f8d62c86b3e4ff9e454af5bba749ddb75d6c01f assets/hee/models/block/cauldron_purified_ender_goo_level1.json
+14ba58c8f70dfdb4ddab3b449cf3e2a7c20eae97 assets/hee/models/block/cauldron_purified_ender_goo_level2.json
+af827d4e9ecf5c93d012c153e4be9facce64c18e assets/hee/models/block/cauldron_purified_ender_goo_level3.json
+810fe27083ada8fc5d977a377e1960e8692539e6 assets/hee/models/block/corrupted_energy.json
 ad88e3d4e3bd11b06d0a4a93ebed8be76aa89317 assets/hee/models/block/dark_chest.json
-e5a5af4002a534f8b77fd76e0d6caab4445d5b00 assets/hee/models/block/dark_loam.json
-e734982b95fc45c399a5594141f023368241276f assets/hee/models/block/dark_loam_slab.json
-9fa22a76cbfcfc3c570bb25a937db987fbc05441 assets/hee/models/block/dark_loam_slab_top.json
-27df86cc0d90165dcfef0de1df77ad014629850b assets/hee/models/block/death_flower_1.json
-6d9a781d67eb4dbe2d2f31d9b5845a0ab9eb6ca4 assets/hee/models/block/death_flower_2.json
-368b95a90a905636deef937dd3019fe19ac9b332 assets/hee/models/block/death_flower_3.json
-99d9b9ea30a882a96d82e33fc97e3951a4b0eba5 assets/hee/models/block/death_flower_4.json
-06a57555956648436c015235844f327fb9320be0 assets/hee/models/block/death_flower_healed.json
-0bac81f0f958b5f353609f845418478177bd3052 assets/hee/models/block/death_flower_withered.json
-96d98103e317debe5442d90300ff701fbb004a39 assets/hee/models/block/dusty_stone.json
-c38623c1e3ad050cb365356ec75625b07900bffd assets/hee/models/block/dusty_stone_brick_slab.json
-6b78fb1a643e24694d27432d7e70c049afdcd2e2 assets/hee/models/block/dusty_stone_brick_slab_top.json
-45d4c4f122e8a5ea641d50d5b89b6bf0b0386ce8 assets/hee/models/block/dusty_stone_brick_stairs.json
-2429b27385b4c8681fdc8f555a5383f3a7825422 assets/hee/models/block/dusty_stone_brick_stairs_inner.json
-360a54b0599116930fa4b1c146a623e7c6add822 assets/hee/models/block/dusty_stone_brick_stairs_outer.json
-37c7389a1e1f4435cf51ff75ee536e638db0fc02 assets/hee/models/block/dusty_stone_bricks.json
-47e1b115f601c3f98658498f5c3a1e304360e977 assets/hee/models/block/dusty_stone_cracked.json
-9873221fc0ada7602335594dbab22b3c0992714c assets/hee/models/block/dusty_stone_cracked_bricks.json
-682e5d72431d1c400ee5e60e668766217ea2ff87 assets/hee/models/block/dusty_stone_damaged.json
-47f10ef5621a1ec67f3e2deab47a8cb7da797867 assets/hee/models/block/dusty_stone_decoration.json
-089b25127e23a55a018919f222745279ecfad754 assets/hee/models/block/end_portal_acceptor.json
-8264ce5f8e94d5ed043642029ef000107ee35c55 assets/hee/models/block/end_portal_frame.json
-4d54ca0d643dac45034429b479e32ff5642aa373 assets/hee/models/block/end_powder_ore.json
-2a07c9e7472d636276bd390049045bb352e7f49d assets/hee/models/block/end_stone_burned.json
-b92c3fc4f8a276a9563b6eb6ff698446285f8163 assets/hee/models/block/end_stone_enchanted.json
-9ba702bf9cff6144346128369baa3eba1e7245c4 assets/hee/models/block/end_stone_infested.json
+ae501a8623f23143c64d5ed0ae74ddf1e94fce10 assets/hee/models/block/dark_loam.json
+77512c6c64002282296e9b83bccacd051b048ef9 assets/hee/models/block/dark_loam_slab.json
+01a29ddcca4d38aa505f9b83e579dab05431e7da assets/hee/models/block/dark_loam_slab_top.json
+f27c455733368aa44e1ff2198f7908f5a8c96d59 assets/hee/models/block/death_flower_1.json
+555b429c5a2218883436aeb5ff7e50d1cddc88cc assets/hee/models/block/death_flower_2.json
+185e658301a7ebec974c8a0537bec2bed952daf6 assets/hee/models/block/death_flower_3.json
+3a5cfab7c24e08ba3eea7ec7e234823de42cc23f assets/hee/models/block/death_flower_4.json
+46d54b0e6ba981dc80e8f698cf889776e9b0355c assets/hee/models/block/death_flower_healed.json
+3484a9b854d0551eb21bf3c855c3a091a0fa8ffd assets/hee/models/block/death_flower_withered.json
+988e522881240b9d6b54358f3a6a42f4712d4b76 assets/hee/models/block/dusty_stone.json
+dd3f78d65f85bb47f6cf99b208d8e5cf195b6083 assets/hee/models/block/dusty_stone_brick_slab.json
+cd0f06588ba4b448d2a5b285c489b33a9d13b20f assets/hee/models/block/dusty_stone_brick_slab_top.json
+59ec934770ecb571109e736669e3bc11cefd4858 assets/hee/models/block/dusty_stone_brick_stairs.json
+80c24bffd7a99fc9a2b9334596d2c2bd901c6e18 assets/hee/models/block/dusty_stone_brick_stairs_inner.json
+3d1ff4dd05070feac16b3580ed38b77075ae3274 assets/hee/models/block/dusty_stone_brick_stairs_outer.json
+89247a25211cf25c9bdabaeb3daa5b61a11860d5 assets/hee/models/block/dusty_stone_bricks.json
+be954dbd5e8caab7c752ad21a5f792fa169569d5 assets/hee/models/block/dusty_stone_cracked.json
+74adc24d45acafcc13a2ac52d9f034ed01fd04d2 assets/hee/models/block/dusty_stone_cracked_bricks.json
+603fe3b3ea95e5828085b2ea5ed9d4153db23eea assets/hee/models/block/dusty_stone_damaged.json
+568486f20d0d881c7d6ad9d893e17cac077b84e3 assets/hee/models/block/dusty_stone_decoration.json
+4bce687f136f4420bf0bef1be9e006e3a143f67a assets/hee/models/block/end_portal_acceptor.json
+dfd6a37537f4dae83bd1d0c21d765b1c00583a9c assets/hee/models/block/end_portal_frame.json
+669c9144edf380611eb467ae70172901755ef689 assets/hee/models/block/end_powder_ore.json
+62a565482334ec3763a13648c7b399cb31cba36e assets/hee/models/block/end_stone_burned.json
+dc7924b4429ba63c9fa2799c5a983848824d52ed assets/hee/models/block/end_stone_enchanted.json
+a370730bc9e87a654c247d324e545140492dad4c assets/hee/models/block/end_stone_infested.json
 29b10fc3da83e5afd32687e8fb470680936d48ed assets/hee/models/block/ender_goo.json
-a6161ca3eff0acf2167182bbdee7728d7008fe92 assets/hee/models/block/endersol.json
-cd7eabdba73e8b92254f783c3e457888424d4969 assets/hee/models/block/endersol_merge_1.json
-0747054b5bf4218e96f37dedc6f61e842cb56218 assets/hee/models/block/endersol_merge_2.json
-ad877d7e542671b5b75b3d4a453be1a884f1d60a assets/hee/models/block/endium_block.json
-494df62cf8faddf115c46d4a2de14531b638b557 assets/hee/models/block/endium_ore.json
-f7ce59a3f35221e51952b9b3f33d664ee94a0453 assets/hee/models/block/enhanced_brewing_stand.json
-10330ff54082b1d21653c15b90f48857a00cc37f assets/hee/models/block/ethereal_lantern.json
-6b85ef98e153114a10d0da321c96a3a8c47f8ff8 assets/hee/models/block/experience_gate.json
-99e8732816d87b7908206bb20b6c890bcdd2798b assets/hee/models/block/experience_gate_controller.json
+9e7d0e53951993c8766a34b8a0548e5a794b0614 assets/hee/models/block/endersol.json
+38a35a069d10d2244bd0f980915ebbafe29dcc75 assets/hee/models/block/endersol_merge_1.json
+f2e86d976bcd985021fbe00d34b1e1b44a64a557 assets/hee/models/block/endersol_merge_2.json
+488e5dec7542396ca80e3bcb02b7313a412aa97f assets/hee/models/block/endium_block.json
+aa8fcca7cb3898e5e7658bbdae0a555209b3f8e2 assets/hee/models/block/endium_ore.json
+01c6bfe57748c7a87ce304024d905c7715f1fe3c assets/hee/models/block/enhanced_brewing_stand.json
+78688919cd3be6d8e511a9e72227c8c1ed3eaf07 assets/hee/models/block/ethereal_lantern.json
+2978d091e8cbd221ee969bb3f2e078c06ef4e3e1 assets/hee/models/block/experience_gate.json
+7f01aebf3576d63fb8f254aa0d6ffd28f11245a4 assets/hee/models/block/experience_gate_controller.json
 e2341e985fabd9e6a94471997a1baeed2d1ae056 assets/hee/models/block/experience_gate_rd1.json
 7b388522136f2304bfe2cf11a1abf470d93ba452 assets/hee/models/block/experience_gate_rd2.json
 cb4790e4cd8cb8038727301ef6f9a527977b9d78 assets/hee/models/block/experience_gate_ud.json
 d5b8a293956fd0805aff3ccdb90b99b25a89b4f8 assets/hee/models/block/experience_table_tier_1.json
 d076ed21d4a7166002009b11c028013021a200bf assets/hee/models/block/experience_table_tier_2.json
 ee4870a6f54463bc01cbc87f228485a342a2cde7 assets/hee/models/block/experience_table_tier_3.json
-dd60beb1fac8cf85a006401abfccbe5ad6bd02a6 assets/hee/models/block/gloomrock.json
-e5854017a3424595246e55416ecd1be6401affb3 assets/hee/models/block/gloomrock_brick_slab.json
-dcf799aa8268e8fb81eee791b30fed0193680a37 assets/hee/models/block/gloomrock_brick_slab_top.json
-4dbd07b78be477a5ebb3a27be707cfbbfdf71fd4 assets/hee/models/block/gloomrock_brick_stairs.json
-8793a1b64cae383bf068df158a8e99ad0dc5c40d assets/hee/models/block/gloomrock_brick_stairs_inner.json
-171ed7421a26a9e102b0737486061804278d4140 assets/hee/models/block/gloomrock_brick_stairs_outer.json
-dc63e38e2c5d80ad6b98b86e37b241fb183cd06a assets/hee/models/block/gloomrock_bricks.json
-8f7b1ccbe6971bd9b1ff9d4180ae2217fe014e95 assets/hee/models/block/gloomrock_smooth.json
-88b2ffe5c90bcfddd021f6fbf5dae418a147075e assets/hee/models/block/gloomrock_smooth_blue.json
-e085d01d475338f5704a307ce7a6fc9f5f0fad6b assets/hee/models/block/gloomrock_smooth_cyan.json
-797504b460ba770e80f8cdcf7c731999cacaf038 assets/hee/models/block/gloomrock_smooth_green.json
-be2eef39790cf0e7b3f0b3254ab1af98b054e70a assets/hee/models/block/gloomrock_smooth_magenta.json
-93b901086c913f3f9c6aa7406a2e6b9506598dd0 assets/hee/models/block/gloomrock_smooth_orange.json
-b85cb86d0569bb4b990a95e37834611c910fd840 assets/hee/models/block/gloomrock_smooth_purple.json
-670773ec938e587d32e1032e6c1a4e6fd3ceb83c assets/hee/models/block/gloomrock_smooth_red.json
-1970ee45f429409ca5b006a0f53229e71eb62e30 assets/hee/models/block/gloomrock_smooth_slab.json
-3b3abaa9f8fbd9141f44bba2ee92c9d3a42e5048 assets/hee/models/block/gloomrock_smooth_slab_top.json
-b63680a04dffdfbc5b271f41eb34a07f04ff071c assets/hee/models/block/gloomrock_smooth_stairs.json
-015336b87078b38c4b2aba486ce01b71442e3005 assets/hee/models/block/gloomrock_smooth_stairs_inner.json
-6df66a06e5e22bab055e0d541b3d7ce58d653686 assets/hee/models/block/gloomrock_smooth_stairs_outer.json
-2c6e15e6bf8d7ff937721cb61f859f04dac2c641 assets/hee/models/block/gloomrock_smooth_white.json
-3b65578d2022f0cee4277ec0d32b6bd94f83fbb5 assets/hee/models/block/gloomrock_smooth_yellow.json
-f663a22199f61b84942bb2490f8a1401891aade7 assets/hee/models/block/grave_dirt_full.json
+74312310051582eff20e76a7d05d02f537810c50 assets/hee/models/block/gloomrock.json
+d507d2c1acc5b329c3bc72539293e095e16cfb01 assets/hee/models/block/gloomrock_brick_slab.json
+457a864afda30d9342ad46ff9ed0b27dcf63cb0a assets/hee/models/block/gloomrock_brick_slab_top.json
+9220df9615dbfd832601e0565361243b9a662fee assets/hee/models/block/gloomrock_brick_stairs.json
+9da4140ec963737ed04d7c333916efb59d5732ec assets/hee/models/block/gloomrock_brick_stairs_inner.json
+a0ff07496f71a67a2362923aa3888587e980f4d9 assets/hee/models/block/gloomrock_brick_stairs_outer.json
+eab5e2e3a7043ad4856a45c2034c4f277f4fb89e assets/hee/models/block/gloomrock_bricks.json
+ae7d874a4445892616e39ba1be47aec78301d305 assets/hee/models/block/gloomrock_smooth.json
+e2951793bdf80988f08214a2954cdc5d0cf53b52 assets/hee/models/block/gloomrock_smooth_blue.json
+2289c9c6405a143a62d2ffcabeafa1e3bc83a90e assets/hee/models/block/gloomrock_smooth_cyan.json
+438bf53ec480510fbee642c68456e59514e9e91c assets/hee/models/block/gloomrock_smooth_green.json
+0a0b6d98c2fb5e1e12c512234c54351ad1dbebfc assets/hee/models/block/gloomrock_smooth_magenta.json
+21b024a4fefead0cbc436e0cd0e81d9218d7276a assets/hee/models/block/gloomrock_smooth_orange.json
+6e3dc519280d5a4c39fe5d1136f2cee6cd19b093 assets/hee/models/block/gloomrock_smooth_purple.json
+5bb84b256137da5df5aaa17b4c1230f2c3d66c97 assets/hee/models/block/gloomrock_smooth_red.json
+8f8f39061720934075413b6427e26d6dda51eda9 assets/hee/models/block/gloomrock_smooth_slab.json
+36de08dfd377a02951a426acae2152fcbdcb6f08 assets/hee/models/block/gloomrock_smooth_slab_top.json
+d2aba5f2770c0947c3972f759f77afcb750c4e4c assets/hee/models/block/gloomrock_smooth_stairs.json
+0c14e9786e1f16270d2bc1e20e2a2cbf474c33e7 assets/hee/models/block/gloomrock_smooth_stairs_inner.json
+22bb693b775892bb1a8ce5064c80a3fe28c97ec1 assets/hee/models/block/gloomrock_smooth_stairs_outer.json
+4ef6a2e6e8248b3a051decb56efe1291838839ab assets/hee/models/block/gloomrock_smooth_white.json
+d5378aafe2c9bb5708588ff14d6ffebbab1bd77c assets/hee/models/block/gloomrock_smooth_yellow.json
+1f61bece65f7b808bbaca5693d37060b54bfbdbf assets/hee/models/block/grave_dirt_full.json
 802dd6b045233a44bd8d9678efef7b79bbf0b42f assets/hee/models/block/grave_dirt_loot_1.json
 8dae96b18114e8ca77b384a003adca6c0090470e assets/hee/models/block/grave_dirt_loot_2.json
 9eb17a6fd0e7dac0d3c3189d902a059b5c2f4f64 assets/hee/models/block/grave_dirt_loot_3.json
 2efb385ab24ce61be0dffa8bcebc7dd9ce3e2f29 assets/hee/models/block/grave_dirt_loot_4.json
 f7c63afe14f1173e1f1ff1679bba3abd0c160534 assets/hee/models/block/grave_dirt_loot_5.json
 d416b2563d93dcea43aa49f4fb61064f45c79232 assets/hee/models/block/grave_dirt_loot_6.json
-a65a90f3bdeaab465ba8379a331d8669e1489e86 assets/hee/models/block/humus.json
-02358f3a229780e80687acf7d7eeb6739e03f553 assets/hee/models/block/humus_merge.json
+9ebc718d03f0657a8cf702f5862509074037c679 assets/hee/models/block/humus.json
+1c3f9ebbf4d4bc8232cfb2585970fd317cc03428 assets/hee/models/block/humus_merge.json
 ac3b3e5529b6baf2447aa9e8e025b35a77032c1a assets/hee/models/block/igneous_plate.json
-7d565e2c21d217a0e33fef46830eb63795cbc934 assets/hee/models/block/igneous_rock_ore.json
-597e525c33450a4d59e3b546e18fbb32ac4883cf assets/hee/models/block/infused_tnt.json
+afc273a852a6802f0f9e4cc252b7c83750e05cae assets/hee/models/block/igneous_rock_ore.json
+e715a206318b020b1e3119db56f8e807ab4c11dd assets/hee/models/block/infused_tnt.json
 63f514ba3c4648bbe843ab4bc5ddf1df70025f0c assets/hee/models/block/infusion_table_tier_1.json
 71efff4640a6fe83ac449de2204e2d2bd0e3f97e assets/hee/models/block/infusion_table_tier_2.json
 18c56872e21de3d66f642f1d6a3c4bccafc461c8 assets/hee/models/block/infusion_table_tier_3.json
-b23cd553caf3084a28382817e4e53d1e18bf5b44 assets/hee/models/block/loot_chest.json
-1532307368f97baefe1c54da15b678e13f4b78cd assets/hee/models/block/miners_burial_block_chiseled.json
-753d5c5e34b31cd8bb90e152f12ede53b1178272 assets/hee/models/block/miners_burial_block_jail.json
-3ba10eb54e8a6dd4a6580bb7516c6c401f6bda1f assets/hee/models/block/miners_burial_block_pillar.json
-06661b8c3b96fc0267d402cea35425fc1fd8ef78 assets/hee/models/block/miners_burial_block_plain.json
-9c1b2b26f3e359399406c06428717a4d74428239 assets/hee/models/block/obsidian_chiseled.json
-f463c84bdfcb03fda47bede7cbb441599128114f assets/hee/models/block/obsidian_falling.json
-ffac40bd0f51bca508dff0687f0123a18834f0bd assets/hee/models/block/obsidian_pillar.json
-e12fee6dca189053dd2b061b24431d724c40a8ca assets/hee/models/block/obsidian_smooth.json
-a0aee16577b35be488a1c446137203cb1087f0d4 assets/hee/models/block/obsidian_stairs.json
-c22ad168ae55565a9c4aec46c760769ca3d6f79c assets/hee/models/block/obsidian_stairs_inner.json
-2e7a3af8b388868c94a6d634fa6a6debd78ac706 assets/hee/models/block/obsidian_stairs_outer.json
-eb950cf6ed456ba5269288de9bcc8f9cb8b6a883 assets/hee/models/block/potted_autumn_sapling_brown.json
-72a2c856cfe64e0089f60aecccdf8abae85534c6 assets/hee/models/block/potted_autumn_sapling_orange.json
-2820553eac77fff5872efb445fa75748b76c6a5a assets/hee/models/block/potted_autumn_sapling_red.json
-3092c5c8e88345dc2327b3cd44180a7639d28313 assets/hee/models/block/potted_autumn_sapling_yellowgreen.json
-a6c42828eaf249a1f7a7c12857f3beb05b732020 assets/hee/models/block/potted_death_flower_1.json
-414d97a93b938f19bdd5ee5bb83507e91345acbd assets/hee/models/block/potted_death_flower_2.json
-50e425d9494935aa5ee2b33efc9c0d2c7b73df91 assets/hee/models/block/potted_death_flower_3.json
-9899539cd7e769d6c1bda3327344915cf4d2b3fc assets/hee/models/block/potted_death_flower_4.json
-53fd7eb645f845b1fd4ecfbe0be68ee99f9a4ed7 assets/hee/models/block/potted_death_flower_healed.json
-34796396bc6a7c920c200e2ab071c85828e86c4b assets/hee/models/block/potted_death_flower_withered.json
+a5f3f2cbbe8628a426817953c087585f65fc2254 assets/hee/models/block/loot_chest.json
+7b4ae46a1f8d7d285d31565ce7cba02a5784d93f assets/hee/models/block/miners_burial_block_chiseled.json
+f86f536da296ac2e2081fe038757e565f7ac6952 assets/hee/models/block/miners_burial_block_jail.json
+7b3afe0784c92fb8e0d8112427e7f2ee1799e5e5 assets/hee/models/block/miners_burial_block_pillar.json
+7e60044fcb9a5806d815a94b49304ff6ca992496 assets/hee/models/block/miners_burial_block_pillar_horizontal.json
+1af20bb8055eb36f6e0b0db1eac13ad7a63ff106 assets/hee/models/block/miners_burial_block_plain.json
+0ed91de9858f63ae21ace09f60cf734bbd27daa6 assets/hee/models/block/obsidian_chiseled.json
+b1c121d633d189b0cb6fbc8b675b5acf0b19a0d4 assets/hee/models/block/obsidian_falling.json
+66637af0fb0dc1f048ce46c7291d6fe3e443e69f assets/hee/models/block/obsidian_pillar.json
+f5677922b8a5a69b2fd2a34cf081fb4dcbd9bd23 assets/hee/models/block/obsidian_pillar_horizontal.json
+66637af0fb0dc1f048ce46c7291d6fe3e443e69f assets/hee/models/block/obsidian_pillar_lit.json
+f5677922b8a5a69b2fd2a34cf081fb4dcbd9bd23 assets/hee/models/block/obsidian_pillar_lit_horizontal.json
+1b0e11f84ba28de0aa31d7b9412fe2795edbebbb assets/hee/models/block/obsidian_smooth.json
+044f93a486236fe0652b53b02ac8fc95128a72e8 assets/hee/models/block/obsidian_stairs.json
+692e799d0ffa87a735cfdf96b478b33a60d45750 assets/hee/models/block/obsidian_stairs_inner.json
+7f5767f2a9896b49cb4e0a016b6de94985722a6b assets/hee/models/block/obsidian_stairs_outer.json
+f04439f2dc88d4d63f5f1b54444282616404f5ea assets/hee/models/block/potted_autumn_sapling_brown.json
+155a4b81d4006b54124d8f5123b68a9cd3d378ae assets/hee/models/block/potted_autumn_sapling_orange.json
+c0dd984d9d0375eb96ddddfabffe5ef0e3b033b4 assets/hee/models/block/potted_autumn_sapling_red.json
+3975f1114c4f1d19d98d80dd2e70f7f07a13da61 assets/hee/models/block/potted_autumn_sapling_yellowgreen.json
+1f398555a2bceb32a60608a56b59e280308f2495 assets/hee/models/block/potted_death_flower_1.json
+8f507e85c80abc8f9e58ec15f6249e32ee19c391 assets/hee/models/block/potted_death_flower_2.json
+47ca820210a09f36a8e08a6bb88e5b4451ed0887 assets/hee/models/block/potted_death_flower_3.json
+850856b49cb503dea1f988056dbbabe8882cae1e assets/hee/models/block/potted_death_flower_4.json
+bab7b2f216f28894448d4d643d79d1867ff57d3b assets/hee/models/block/potted_death_flower_healed.json
+af00a9d2876e603216becc217d4690b83e33a157 assets/hee/models/block/potted_death_flower_withered.json
 e263407687e777250cc092c8c7cc1b1f95bd69b7 assets/hee/models/block/purified_ender_goo.json
-cdca16c8bf3446af886dadfed6f8bb75d9ca8aa1 assets/hee/models/block/puzzle_base_active.json
-79a9ce0aced147650140cf5c4b38583d59dc64da assets/hee/models/block/puzzle_base_disabled.json
-453a5fc499c51b091014a8ab105d6486e10a631e assets/hee/models/block/puzzle_base_inactive.json
-6421450799aad14b172a76826446cde53b143518 assets/hee/models/block/puzzle_block_wall.json
+90b2f46042b44ab1d5cc3b9a51ec1f825fc9d212 assets/hee/models/block/puzzle_base_active.json
+57a2ed9b6fa5140769e0a25a267885df79f2ef14 assets/hee/models/block/puzzle_base_disabled.json
+74df77ab14d1e7d9d3eb3b4cb8aceb1034eec022 assets/hee/models/block/puzzle_base_inactive.json
+5efef464bf72b16ca78da084e80aeae5cb3bbf22 assets/hee/models/block/puzzle_block_wall.json
 905c46cc5a0e5c8ab37a6047d33494289974342c assets/hee/models/block/puzzle_overlay_burst_3.json
 fffe32de4f74c8e238b7fba46f6a7fd96c00073c assets/hee/models/block/puzzle_overlay_burst_5.json
 e7143ed84eb7bdc26b75dcb81a20c55e474b7efc assets/hee/models/block/puzzle_overlay_redirect_1e.json
@@ -242,67 +246,69 @@ df1da07bdb9f4c6ef5caf10d7b0d4ce670ad84a5 assets/hee/models/block/puzzle_overlay_
 acb30b3674a73745e14ec2e2645fe90077aaad80 assets/hee/models/block/puzzle_overlay_redirect_2ns.json
 dfbe5ca94466b5bba9f76af8884c9e023ca0f88e assets/hee/models/block/puzzle_overlay_redirect_4.json
 b5a186bc8fadaf0359a19cee67a9e36c3c54edc7 assets/hee/models/block/puzzle_overlay_teleport.json
-c76f5ddc22151edad5a90dc8d36a6a21742d4825 assets/hee/models/block/stardust_ore.json
-69531e8b56d1f22f248abe2119b3d328436e83b4 assets/hee/models/block/stone_brick_wall_inventory.json
-436d53c415540b32d002c7d7e84e04685fcf451b assets/hee/models/block/stone_brick_wall_post.json
-293dd8d478be6c72d3a2e9fc701a0d8041b78ad1 assets/hee/models/block/stone_brick_wall_side.json
+6966879301429fb56f4ce03bc621758103fc2f30 assets/hee/models/block/stardust_ore.json
+32c27f3be2906c9d3a490ea51c86365701905e56 assets/hee/models/block/stone_brick_wall_inventory.json
+9b5eca74c3c14688e3581e51d125990a649f0b54 assets/hee/models/block/stone_brick_wall_post.json
+a71ee96b82f78b1aebc1dc6e8b6bfe9c41458b7c assets/hee/models/block/stone_brick_wall_side.json
+f0653732afb83d336b8c42b90c83312f633cd988 assets/hee/models/block/stone_brick_wall_side_tall.json
 41ed731b9cdf43c640eb30b4afe4d07c398998d8 assets/hee/models/block/table_base_tier_1.json
 80dba135838e7e09bdaec81de85ed1cac86afaba assets/hee/models/block/table_base_tier_2.json
 599436b696068b179b023bdf27ff8f550c83b1f5 assets/hee/models/block/table_base_tier_3.json
 9fd50649be4bdffdf19d46dbb966948b61b6dbd5 assets/hee/models/block/table_tier_1.json
 16c6486c444a71545d0daddafb0f3ea3902e11c1 assets/hee/models/block/table_tier_2.json
 abfe03a326e076947a48407184a22c1531134e15 assets/hee/models/block/table_tier_3.json
-2a126f2bb546dc28b4545fccec5e1d0a522bcb27 assets/hee/models/block/vantablock.json
-ab0a1800b6187fd05e589be57687c501f49ac7a7 assets/hee/models/block/void_portal_frame.json
-ab0a1800b6187fd05e589be57687c501f49ac7a7 assets/hee/models/block/void_portal_frame_crafted.json
-b3c9bd5a8feb5785e0b421c1b5e01dd91854c12a assets/hee/models/block/void_portal_storage.json
-b3c9bd5a8feb5785e0b421c1b5e01dd91854c12a assets/hee/models/block/void_portal_storage_crafted.json
-925012d29c33f75f0bc4bdda7d726a97135d8d30 assets/hee/models/block/whitebark.json
-59a93d008066a819c842360d01d899f0f2234394 assets/hee/models/block/whitebark_log.json
-2bfa948c604c4ee7513e12e3649e55e190cd0a65 assets/hee/models/block/whitebark_planks.json
-61b3e27341c07c21e0a78a876e1026c844aa9c73 assets/hee/models/block/whitebark_slab.json
-866614329f097be1f40a9b8e80acf214a795b8fe assets/hee/models/block/whitebark_slab_top.json
-aee09e3fdc4244eac11852168590ba6acae8eb75 assets/hee/models/block/whitebark_stairs.json
-b3d691859554bae609c8e942e1e02693b7f62c39 assets/hee/models/block/whitebark_stairs_inner.json
-bde486f1ae1775d6eaf5b2770f252815952c5a09 assets/hee/models/block/whitebark_stairs_outer.json
-58727a817f32ab033f22bb542b2f00fb597c015f assets/hee/models/item/accumulation_table_core.json
+14959ab4a8cab7cd62d7911992fcdefc94521c7c assets/hee/models/block/vantablock.json
+b0a2a745242dd211d86390ef5e7c7d66f24db09e assets/hee/models/block/void_portal_frame.json
+b0a2a745242dd211d86390ef5e7c7d66f24db09e assets/hee/models/block/void_portal_frame_crafted.json
+51a38bc20f9d3ebe98a731bf45e4be730ab4f8be assets/hee/models/block/void_portal_storage.json
+51a38bc20f9d3ebe98a731bf45e4be730ab4f8be assets/hee/models/block/void_portal_storage_crafted.json
+06a766c3b14d1dde80384d45d192dd45f78ff1a8 assets/hee/models/block/whitebark.json
+e9b79499f8282f7ba3af3c8c916e32800822b31e assets/hee/models/block/whitebark_log.json
+f3400125b4a11dddea29ae459bc1ced030c9ab4e assets/hee/models/block/whitebark_log_horizontal.json
+bf5bd062ece1d8300b68a7e3dfee6a0fadb8bab1 assets/hee/models/block/whitebark_planks.json
+19b8cef33a1ba118a65c04f36ea0943df7d93103 assets/hee/models/block/whitebark_slab.json
+8c237cb0b1729e3b216c2018444c9e12249a4dc8 assets/hee/models/block/whitebark_slab_top.json
+ad3d7b594a6149c1316243498dfbdef6cb9ecc5f assets/hee/models/block/whitebark_stairs.json
+a44a872ec38b7691ed05a6b215873046c8da94d4 assets/hee/models/block/whitebark_stairs_inner.json
+1589e107d1a26df291f3e4a68fa82511ef9f7bc5 assets/hee/models/block/whitebark_stairs_outer.json
+85e6b21554df0839bf09ca6f480dfbec40ac43c7 assets/hee/models/item/accumulation_table_core.json
 29fda0b69b0bd33e1387a509001087c85f9f3584 assets/hee/models/item/accumulation_table_tier_1.json
 9b3ed5d436d95a87f5e10102572d0b504a373a6a assets/hee/models/item/accumulation_table_tier_2.json
 17c6040f6c7ef96ae687924eb6337760784c4032 assets/hee/models/item/accumulation_table_tier_3.json
-519677517417006bd650eff371f8fd39376c88e4 assets/hee/models/item/alteration_nexus.json
-75b1bbfc036225bbc5c1fdef68f80132a4a5b2ef assets/hee/models/item/amelior.json
-e14a286bb906068799d7593c88bf7ca92599e9a9 assets/hee/models/item/amulet_of_recovery.json
-07e75402c03c713b381864b5a4e8049a8a6d495b assets/hee/models/item/amulet_of_recovery_held.json
-1f2823788829cca9f4e4a60c6da8ca4a5f4d198f assets/hee/models/item/ancient_cobweb.json
-83fca51d47b97beeef137ffd178af13d9443d501 assets/hee/models/item/ancient_dust.json
-640fb723df4adaf9b0e055a7e45afa7756e5acb4 assets/hee/models/item/angry_enderman_spawn_egg.json
-a1832ac0a6d7ba4740e1304226ca096c2f36a7c1 assets/hee/models/item/auricion.json
+1ae99593fd8bfaa640acc668ba19d634d2d05140 assets/hee/models/item/alteration_nexus.json
+f5a5aa8ff87306d75c12e5d02bd29e59f70282e8 assets/hee/models/item/amelior.json
+3ef6f3a05e08e0aa821e229417fe64fd43f3bde9 assets/hee/models/item/amulet_of_recovery.json
+a3a7c90b5308de5fd808e1e99da03050713815d8 assets/hee/models/item/amulet_of_recovery_held.json
+43959625db9643bfa2d94e6a311ebbaf2ddfbb61 assets/hee/models/item/ancient_cobweb.json
+02c2fcf997fdbca66dcdd77d24554083ca56fee9 assets/hee/models/item/ancient_dust.json
+98167609bf3898587f7565736a6fc24a7966cacd assets/hee/models/item/angry_enderman_spawn_egg.json
+0349ddac66a7c18658d4899239c44eaf5637cce0 assets/hee/models/item/auricion.json
 c58547a5da39a6cc21cc89c4e356ee4a2d95477c assets/hee/models/item/autumn_leaves_brown.json
 0195e6157eb8125db9625c75467e8140ea1bc883 assets/hee/models/item/autumn_leaves_orange.json
 f0a3371c2e3e14357336f10116204da9832fd082 assets/hee/models/item/autumn_leaves_red.json
 843f49a4b4eec8b7f1c2ee29ed165832821e17a5 assets/hee/models/item/autumn_leaves_yellowgreen.json
-e95f14a54e64aaa7bfedb6c812824bf4407b5766 assets/hee/models/item/autumn_sapling_brown.json
-d762ea1869e7a998dae3ce2500ed02d181aafc69 assets/hee/models/item/autumn_sapling_orange.json
-8e99a8d20f6d7ef5b210c822ea557e86e914a721 assets/hee/models/item/autumn_sapling_red.json
-1730472ca46fd8e777b0f5d57bb73906598f106a assets/hee/models/item/autumn_sapling_yellowgreen.json
-1d3ac095ec2cdca828663cd0ed0d9b2fb8a8d52d assets/hee/models/item/binding_essence.json
-6af6173ea70e2e8321657d145e55aef173f0328d assets/hee/models/item/blank_token.json
-640fb723df4adaf9b0e055a7e45afa7756e5acb4 assets/hee/models/item/blobby_spawn_egg.json
-066adb92d80f4bd2f4719230fd1db6221bd569b7 assets/hee/models/item/compost.json
+ffbc19b2aeeb81c1acf03dfc6f4ab101b5602f7a assets/hee/models/item/autumn_sapling_brown.json
+84240df2a4ce50a6aed319595620f6f5ed852b77 assets/hee/models/item/autumn_sapling_orange.json
+688cabfe5222505e6588a236f75b75395e40fcaf assets/hee/models/item/autumn_sapling_red.json
+52ac8f056f511553705d60c15587f76126a86d09 assets/hee/models/item/autumn_sapling_yellowgreen.json
+801aa8a04599a1f62b85208b248bfdd35a413b4b assets/hee/models/item/binding_essence.json
+2ef2d9dd8a04a7a2bb0d0a75570565ff4921cf67 assets/hee/models/item/blank_token.json
+98167609bf3898587f7565736a6fc24a7966cacd assets/hee/models/item/blobby_spawn_egg.json
+fda3face7f4a5bb8debff8958d1d4920860cd1c3 assets/hee/models/item/compost.json
 bd805b17a4641f39e85e70aa5e10f45b0f0d32ce assets/hee/models/item/corrupted_energy.json
-50eb3ea252a7bae24f52b9f414f883f9924bed93 assets/hee/models/item/dark_chest.json
+5305057f6e86d0fb549f22e6d49a2ca6e9723c54 assets/hee/models/item/dark_chest.json
 45959256d2d1b4548f4f528d2d690816697955d2 assets/hee/models/item/dark_loam.json
 d6669437273af857f67460b9ffc674f07cc07630 assets/hee/models/item/dark_loam_slab.json
-2158b120c5310514f6dc3d7ed23dda2377aaac94 assets/hee/models/item/death_flower.json
-46d8c4b0da74cb645fb5f88ab4081abcb7df268c assets/hee/models/item/death_flower_1.json
-84e620bd512f1f39478a0758fec24a3ec35f02fb assets/hee/models/item/death_flower_2.json
-61c653f977a58a8dfa1f274e673dc6c5f620e7e1 assets/hee/models/item/death_flower_3.json
-153c9779a0a1f8dc95c000c2f7c92604dfdf77a8 assets/hee/models/item/death_flower_4.json
-4adea84d11f03a11c378ae9c71ea76d23bf691a4 assets/hee/models/item/death_flower_healed.json
-6ac0ca2f78da37bf923364a7f3423edd5583203e assets/hee/models/item/death_flower_withered.json
-ae6b487851db2c6fdb6e1ff503daaf83109e4a3f assets/hee/models/item/dirty_infernium_ingot.json
-1dce873fc89db15c99c08e38439aaf4c9695a3dd assets/hee/models/item/dragon_scale.json
-6680b39053b280a9c4f87a0aa634a2a8f857bf05 assets/hee/models/item/dry_vines.json
+29a46cde7571671d6d11ff48465e39c7b2a13ec5 assets/hee/models/item/death_flower.json
+8a1c37cd4e5b974c91bfd66821b551f668fe3d67 assets/hee/models/item/death_flower_1.json
+65d9806a7c8ea9eb2244d68f2a59b463c433bb6b assets/hee/models/item/death_flower_2.json
+4a273bdcf2de671617ae74d8a9be75963af92a64 assets/hee/models/item/death_flower_3.json
+1df6d4531ba36b54f674775addd2541e9e2b9a09 assets/hee/models/item/death_flower_4.json
+e5ab75b6464dd549e1b3b38f0e32e71b1ebfe57c assets/hee/models/item/death_flower_healed.json
+d77efb21d706c04adf7630142baa3b913cc40e47 assets/hee/models/item/death_flower_withered.json
+a81e73bce7a0a1e8f3d4961acf5b79e9ae665780 assets/hee/models/item/dirty_infernium_ingot.json
+290205f6950fffd8bf7e02daa0aa8e6bdd4e6f9c assets/hee/models/item/dragon_scale.json
+9cd68d3fa5d5f8a177d62eb85d33d8b92b8fa788 assets/hee/models/item/dry_vines.json
 5c883c3f41988cbb8c2d951f0618ea4c0e6f05fc assets/hee/models/item/dusty_stone.json
 44cc06238796ba005591874fa0d7212b7cadd677 assets/hee/models/item/dusty_stone_brick_slab.json
 8fde3d2930c4bf486e7915842e066b1994ac06ec assets/hee/models/item/dusty_stone_brick_stairs.json
@@ -311,41 +317,41 @@ bf175fd613b22e2a4c4b4eff18390e560b216475 assets/hee/models/item/dusty_stone_crac
 edd2fb824d66be21a03cbf2ca5acb66b9356e0b0 assets/hee/models/item/dusty_stone_cracked_bricks.json
 e6495ff33b83daf5fb46caa0ae218692cef24983 assets/hee/models/item/dusty_stone_damaged.json
 22032289cbd150dd51b35dc33d0978b1b25fa6e0 assets/hee/models/item/dusty_stone_decoration.json
-37d9ec9fa292db62bb8d0fd8767d0bb94506a713 assets/hee/models/item/ectoplasm.json
-534d83cf1d8143a886a78dce7b44d0cb9e774391 assets/hee/models/item/enchanted_claw.json
+7962531a5c45d33a202578032e2bb1f350eccb5b assets/hee/models/item/ectoplasm.json
+3c0a079564c24b5d8a9e27e67236cfd236e94ab1 assets/hee/models/item/enchanted_claw.json
 1da33f8b25e7cb110206a690044c62fb5f376e17 assets/hee/models/item/end_portal_acceptor.json
 abc621bf572678443064042b3af7edffd693e725 assets/hee/models/item/end_portal_frame.json
-acaeff15707c76d36a48bad65c9a4814e5a371d6 assets/hee/models/item/end_powder.json
+7c0006c8f621bf107f610fdc47e9e9ba0db07d68 assets/hee/models/item/end_powder.json
 841ff4a4501f7a08fa8da46813a57a1cb966e813 assets/hee/models/item/end_powder_ore.json
 5456d2995061acdb3ec8d0386323cb025ed48dc7 assets/hee/models/item/end_stone_burned.json
 4f57b1726466bb1eb0f6847c7f79e333b536dac5 assets/hee/models/item/end_stone_enchanted.json
 3eaa48b3e48d003fdc262a53f198e49de3a4d84b assets/hee/models/item/end_stone_infested.json
-640fb723df4adaf9b0e055a7e45afa7756e5acb4 assets/hee/models/item/ender_eye_spawn_egg.json
-bc561c5e35778468667d37fda69ff333f3532ef3 assets/hee/models/item/ender_goo_bucket.json
-4bc90be7c28968c1caf2b4f9f74bcc859b72da19 assets/hee/models/item/enderman_head.json
-640fb723df4adaf9b0e055a7e45afa7756e5acb4 assets/hee/models/item/endermite_instability_spawn_egg.json
+98167609bf3898587f7565736a6fc24a7966cacd assets/hee/models/item/ender_eye_spawn_egg.json
+dfd4595b47601fc0207a71335d39f5c3407b009a assets/hee/models/item/ender_goo_bucket.json
+d5e1c9824cafbb698e2291c88c0ac69c7c702318 assets/hee/models/item/enderman_head.json
+98167609bf3898587f7565736a6fc24a7966cacd assets/hee/models/item/endermite_instability_spawn_egg.json
 fb147135094add14099b0cb88104449cef93172f assets/hee/models/item/endersol.json
 00ea9ddf2328b946fede7a96ae26941a2a244a64 assets/hee/models/item/endium_block.json
-36b710de880f3669642b1311f29a2726f0e686a5 assets/hee/models/item/endium_ingot.json
-663ea0f291bc3fcf4fd1dd7f7b633a3f5444d19c assets/hee/models/item/endium_nugget.json
+c6c8f44f08f072763f8dffbc41dea83989b9e2e1 assets/hee/models/item/endium_ingot.json
+ed44d859cb160457b55d25b30bd666c002742302 assets/hee/models/item/endium_nugget.json
 baa90fe786e281b9c0bbcd46216d75cc70f138ed assets/hee/models/item/endium_ore.json
-f0e4798b4a2fce87631034675a16a7b65b74932b assets/hee/models/item/energy_cluster.json
-985b5436b3d9f04afc9e5c962fe3293461df1fbf assets/hee/models/item/energy_oracle.json
-1af55c36a4356c9cc987d8042a7c5f4622748e81 assets/hee/models/item/energy_oracle_active_full.json
-320db1ca04949669203abede01596c4b3f1b8229 assets/hee/models/item/energy_oracle_active_mild.json
-f937c1ca521b8afbb1621a7b2723ce5a52842312 assets/hee/models/item/energy_receptacle.json
-f1cb2e95c7acaa795827a785d67094a4fa09ac99 assets/hee/models/item/energy_receptacle_with_cluster.json
-728d4434047ca1d7d2357d58ea1a410c2c1200de assets/hee/models/item/enhanced_brewing_stand.json
+948d6e0aa3056253e5640c3d5c8136393bd3b15e assets/hee/models/item/energy_cluster.json
+c91fe7ae97dc86f139873a6943992e6446938130 assets/hee/models/item/energy_oracle.json
+c8b6a60d75700dbfef3c374f99c1603c114084e0 assets/hee/models/item/energy_oracle_active_full.json
+b392d53da730b95cb68b3b1f20016818c62e20d1 assets/hee/models/item/energy_oracle_active_mild.json
+d1a54a740d80f2a0a455d37d777f5f3d7b68e0a2 assets/hee/models/item/energy_receptacle.json
+ad36993ab5e2d91c8fbb99229ad7b59ddd1b003b assets/hee/models/item/energy_receptacle_with_cluster.json
+06122ab20c4eabb5e0ff1fe60672fa2469776b8a assets/hee/models/item/enhanced_brewing_stand.json
 dbeff56876e8685507aac69b36706a8cedad06d8 assets/hee/models/item/ethereal_lantern.json
-12eb81c2e73711a03f69ea7b0fc74ce5df5b5e2b assets/hee/models/item/ethereum.json
-47fe20a9ae70b0f1a7bd3c5c8e5192160cf1597f assets/hee/models/item/experience_bottle.json
+6344357fe3a96ecc855cfd79fc9458a6c5075895 assets/hee/models/item/ethereum.json
+407f2a9f7660f51006be1dc10582fbdc82455e1d assets/hee/models/item/experience_bottle.json
 be887ee715153936025a1bf9c5a323cceba9a734 assets/hee/models/item/experience_gate.json
 04fc2cd874252d4b4fe0c378e785649954d15060 assets/hee/models/item/experience_gate_controller.json
-d2b32b618f590475190d05830639bba303c05327 assets/hee/models/item/experience_table_core.json
+bf471badf6617698e28b92a8cf83ad359ab8e2d8 assets/hee/models/item/experience_table_core.json
 6b86f78b2fd64f7d46033d84f18741b8e1f80bee assets/hee/models/item/experience_table_tier_1.json
 39067ccd67f341609c8e687e7aa36451c63448d0 assets/hee/models/item/experience_table_tier_2.json
 d230b54ddf2925b3453ba0dee5a530477d83dfc0 assets/hee/models/item/experience_table_tier_3.json
-135f0f07203e9253ef1ee93fde653f3ea3317e8a assets/hee/models/item/flint_and_infernium.json
+a1969a6944822932cb09a11f53fa48651d6f10a5 assets/hee/models/item/flint_and_infernium.json
 0c197fa73f7bc7a069f1e63fdaccc22953682eed assets/hee/models/item/gloomrock.json
 77d91e745be5f76a3afdeba04391b2e38dd40f42 assets/hee/models/item/gloomrock_brick_slab.json
 22f9872450c8b5a2679fd4fb77b86f7724eb32c6 assets/hee/models/item/gloomrock_brick_stairs.json
@@ -362,28 +368,28 @@ ffd3c5f32254dac68bfa8cf5b861ab718801653a assets/hee/models/item/gloomrock_smooth
 494ed7ece658bd8129055592f9207f43058f1783 assets/hee/models/item/gloomrock_smooth_stairs.json
 616aba6a22836b4b5b0431b8ce0415726756df4a assets/hee/models/item/gloomrock_smooth_white.json
 722a98617cf38486b7b6a202a3403d558644bedb assets/hee/models/item/gloomrock_smooth_yellow.json
-0b7b33a61555978fd0f0e71a04719f78d5871c55 assets/hee/models/item/gloomtorch.json
+d52d49d3fd212e152aafe2cd9c385ed5cc5617b6 assets/hee/models/item/gloomtorch.json
 f86134f023c3a3b39ca42acc6f39c8b2debb6492 assets/hee/models/item/grave_dirt.json
 80d941a4f661bc9f77eb36848c137eb95ae817db assets/hee/models/item/grave_dirt_loot.json
 f86134f023c3a3b39ca42acc6f39c8b2debb6492 assets/hee/models/item/grave_dirt_spiderling.json
 43771785c5b33210e8bb17e6240e6927dd3074f6 assets/hee/models/item/humus.json
-8326030007da6b72aa787585105b601b9b64df0c assets/hee/models/item/igneous_plate.json
-e4d70fde368e241d25bb8584a38aa44655f9a8ff assets/hee/models/item/igneous_rock.json
+85c8271cebc126a2679358f7142cc7c5bafbfe6b assets/hee/models/item/igneous_plate.json
+60e7e04f351c10086cb20694f233ece7a42667a3 assets/hee/models/item/igneous_rock.json
 f3c80f531a7b7bf16caa6c1ea9ccd75d69ce296c assets/hee/models/item/igneous_rock_ore.json
-20b733841c5b76ebe77ef7af189fe59a289dcae1 assets/hee/models/item/infernium.json
-6837505cbe9a21ee0f14d534a080d080fab178e8 assets/hee/models/item/infernium_ingot.json
-1401209abbdc7734550c937c68b4042da84e8296 assets/hee/models/item/infused_ender_pearl.json
+b23c593e2e0665bbc92bf259310ae78202a4d93a assets/hee/models/item/infernium.json
+b51cef98d03746120d6a5ed54b2237b7859acb7e assets/hee/models/item/infernium_ingot.json
+32249519a5b92bcb5bd9c5cb08fcaafc7b928cf1 assets/hee/models/item/infused_ender_pearl.json
 cbd1e6787e2d71d04a70027b0b312655bbc1cb57 assets/hee/models/item/infused_glass.json
 87a94cb8c8d61f599c1db7cbd8c6653f08722028 assets/hee/models/item/infused_tnt.json
-fcb913f4ea4404923e626d9bd58a7fcaa3a32678 assets/hee/models/item/infusion_table_core.json
+39d7a1ca4803e2c0fd2ae4642666130f91e0305d assets/hee/models/item/infusion_table_core.json
 c489f2923e462ed978a0dbbab50730f3196f079d assets/hee/models/item/infusion_table_tier_1.json
 dcc2f456158e470a30d33fc750113763dade4337 assets/hee/models/item/infusion_table_tier_2.json
 dbc99db6c80c85b386d279d5f07bb6abd79d70d2 assets/hee/models/item/infusion_table_tier_3.json
-2a72cca4da492d5e971a3f2fe5368a7971210fff assets/hee/models/item/instability_orb.json
-3e09b8d0b1770aefd331df22a50e34255c4a3507 assets/hee/models/item/knowledge_note.json
-9a50fa05e3738bed55c7bf239ab237ba4ebdce60 assets/hee/models/item/linking_gem.json
-50eb3ea252a7bae24f52b9f414f883f9924bed93 assets/hee/models/item/loot_chest.json
-bc29ffb141033419ff037d7c0f87bfd43e2a0eeb assets/hee/models/item/mega_void_salad.json
+0669791dd05499464817b5cc1a9cc192768626ef assets/hee/models/item/instability_orb.json
+39d68250b2f9cb4afb739ae8ae788b12e0871a9f assets/hee/models/item/knowledge_note.json
+b39ba4c74220d40435e6e6d88de9bff1a161390f assets/hee/models/item/linking_gem.json
+5305057f6e86d0fb549f22e6d49a2ca6e9723c54 assets/hee/models/item/loot_chest.json
+8218be8dff244958ff2f275f3ff74e08dbd880f6 assets/hee/models/item/mega_void_salad.json
 95ccdc827661a4ca9ae90045a8baeb7252acce80 assets/hee/models/item/miners_burial_altar.json
 321ffe632896e82f1c6967dd3dd1f41c04c2791a assets/hee/models/item/miners_burial_block_chiseled.json
 5f347e02bcfb34cb86524ba28c6481ec5b63df3c assets/hee/models/item/miners_burial_block_jail.json
@@ -392,20 +398,20 @@ b0ccc08c142525e3d82a6643d34dfb0d82385571 assets/hee/models/item/miners_burial_bl
 7a8592c4a45ccdea4ca36898b3371364f6aab2ca assets/hee/models/item/obsidian_chiseled.json
 7a8592c4a45ccdea4ca36898b3371364f6aab2ca assets/hee/models/item/obsidian_chiseled_lit.json
 6ec06a3d2286e954a180a021f8e2fa0847bc62a9 assets/hee/models/item/obsidian_falling.json
-8ed26ada407bcb16daaa3e73ee4eca80fc0b2dfa assets/hee/models/item/obsidian_fragment.json
+3c4e981d4d1945965dfbdc0e4c5ce4c2325646ca assets/hee/models/item/obsidian_fragment.json
 28e22c71e0b66c4f05a034efed3fdc1c53ed3446 assets/hee/models/item/obsidian_pillar.json
 28e22c71e0b66c4f05a034efed3fdc1c53ed3446 assets/hee/models/item/obsidian_pillar_lit.json
-5cce674f56184d54503d1b53bd6df587d8b6d1ff assets/hee/models/item/obsidian_rod.json
+924997ebaa634101af362348c4cec4ea8a10c4c3 assets/hee/models/item/obsidian_rod.json
 3cd76aaab489b5f59bcb03661ad7985fca28ab50 assets/hee/models/item/obsidian_smooth.json
 3cd76aaab489b5f59bcb03661ad7985fca28ab50 assets/hee/models/item/obsidian_smooth_lit.json
 065a2b9d6d23c21d720bd6e613a8bd0951f7767a assets/hee/models/item/obsidian_stairs.json
 7a8592c4a45ccdea4ca36898b3371364f6aab2ca assets/hee/models/item/obsidian_tower_top.json
-460da0eadfb9a5a6587f6c4ef44517ec3e372766 assets/hee/models/item/portal_token.json
-b0a0ea36fbe5e98c3be783a86b280e9fb4e804e0 assets/hee/models/item/portal_token_rare.json
-d23d582796975225a5c0e13a8b76ac9fb5627112 assets/hee/models/item/portal_token_rare_corrupted.json
-d277ad51c2ab5b9046bfac7a60d87b64fac80ae1 assets/hee/models/item/portal_token_solitary.json
-b085518b4384882dbd09e39af22cc8d81a47fb04 assets/hee/models/item/purified_ender_goo_bucket.json
-b0b0a45f5cd6bd97666bc12698313d417d634ff2 assets/hee/models/item/purity_extract.json
+1a681f9cb95443141eec21b7601988cbe4de716e assets/hee/models/item/portal_token.json
+a08ec841d998fb7db4122f057ae31d4cc192d4da assets/hee/models/item/portal_token_rare.json
+f4460909993c785fd3e61630c77af14a7afa33b4 assets/hee/models/item/portal_token_rare_corrupted.json
+bf3ccef08b5d0eae24b20b8dc05511958c8f6c56 assets/hee/models/item/portal_token_solitary.json
+b3fe837bc4c46c21fd8ad87994a9204bfe9fc227 assets/hee/models/item/purified_ender_goo_bucket.json
+3c9de48319bfaef9f0613b55d3a65cba53074140 assets/hee/models/item/purity_extract.json
 dd7ce403cf0eb7b5177d3d92cc7da22159a46577 assets/hee/models/item/puzzle_block_burst_3.json
 f106b9e8dc700e68b67aab4a4809b138bde76fe9 assets/hee/models/item/puzzle_block_burst_5.json
 1eeb3de8ec8609557177ed2c81a458d3ab6a60df assets/hee/models/item/puzzle_block_plain.json
@@ -414,47 +420,47 @@ db436a0a41f316cfa2e368b246fce958e65dc2b1 assets/hee/models/item/puzzle_block_red
 decdba40a05cce4ba1014fea7502f246937f6fb3 assets/hee/models/item/puzzle_block_redirect_4.json
 95fa8a40230c31d56e385ccbe680a91f1f9d560e assets/hee/models/item/puzzle_block_teleport.json
 968bebe3d8f82e18afd62cb4e8ecaa7400927d52 assets/hee/models/item/puzzle_block_wall.json
-30a433ac5844e1259992acb67e0544c4c6714542 assets/hee/models/item/puzzle_medallion.json
-6da77feef3a5079082bd578202bc170050b8df4a assets/hee/models/item/revitalization_substance.json
-9a450490268f1fd1e6a8b69fade3c6cdfcb56678 assets/hee/models/item/ring_of_hunger.json
-e2fd9e76d812547a1934a5c361d129c2879a7a91 assets/hee/models/item/ring_of_preservation.json
+dcc9db7940acadcc3a782de975f8b429a285d166 assets/hee/models/item/puzzle_medallion.json
+f8a177d01a817e091839bf59c58b4e44928dd13a assets/hee/models/item/revitalization_substance.json
+b6006cd565a2f853d2179fdadb08f8b6044db6e7 assets/hee/models/item/ring_of_hunger.json
+c334431b4f27af86b93552d6a8ef469ccabb6732 assets/hee/models/item/ring_of_preservation.json
 bef5798b29e840c09c13b8246e81785fbe679116 assets/hee/models/item/scaffolding.json
-05bacfe43fce738d4521559841e941aac51d98af assets/hee/models/item/scale_of_freefall.json
-d853c3d4434b5807093cf6afde227bfdc4ebcefc assets/hee/models/item/scorching_axe.json
-fbf57a9528063e08e4ee32770bdf4b4d4c0a01d5 assets/hee/models/item/scorching_pickaxe.json
-683fb975792606f265056deb3255140666bc50c5 assets/hee/models/item/scorching_shovel.json
-a394752d1c1736419c0227665458c4afb75eb09e assets/hee/models/item/scorching_sword.json
-3ab42828b6498304934466e83d09d740abe999d9 assets/hee/models/item/spatial_dash_gem.json
-640fb723df4adaf9b0e055a7e45afa7756e5acb4 assets/hee/models/item/spiderling_spawn_egg.json
-55da1fee55b938d5887eeaa39e5a370d14297895 assets/hee/models/item/stardust.json
-fb9eb07fd5e612b79b63bce6fff84777e6667120 assets/hee/models/item/static_core.json
+312290e0ff559adf32ea62e053b6ae66b4b709d9 assets/hee/models/item/scale_of_freefall.json
+b3e3bc6248fdcf3c947dc4f0af9ac6727daa1415 assets/hee/models/item/scorching_axe.json
+26b5a5e546dbf6a0f3905a6e12bf604d14c5755e assets/hee/models/item/scorching_pickaxe.json
+13df83c7b66ed7bb0883960f82e8d8861e728472 assets/hee/models/item/scorching_shovel.json
+1cf6e3f1545f61321a955a309691a5c8390d5623 assets/hee/models/item/scorching_sword.json
+5a928c61bd0314a1b5fdbd90d203776b9849fb58 assets/hee/models/item/spatial_dash_gem.json
+98167609bf3898587f7565736a6fc24a7966cacd assets/hee/models/item/spiderling_spawn_egg.json
+c123185c2cbc7de8a4c5438363759abf9114d358 assets/hee/models/item/stardust.json
+b74b903e432221615ea193412090d0e85a1a7cf5 assets/hee/models/item/static_core.json
 7d4f5f7e42a4e61906e21116a7ce870d6fc1d9a7 assets/hee/models/item/stone_brick_wall.json
 318d4cbdbbe3a37df190312868442462e2076e9e assets/hee/models/item/table_base_tier_1.json
 8063e78a154c774cba0caf141b1b2281843ddb90 assets/hee/models/item/table_base_tier_2.json
 da6bb690ebe06b875da997c938f39085a63eec96 assets/hee/models/item/table_base_tier_3.json
-ad360de7f63690ff3053be1c852d314e4158338d assets/hee/models/item/table_link.json
+b78a95cdea74e20fcb37765b44c221b9a9002b07 assets/hee/models/item/table_link.json
 e7132d43914c87e9f78a88368a773a83852c4f8b assets/hee/models/item/table_pedestal.json
-c7318f3a823171b9fc8382daba815bfc0cf123e0 assets/hee/models/item/talisman_of_griefing.json
-94947e0de33123f203dba33ede61a1b2ee2932a6 assets/hee/models/item/ticking_core.json
-77032b1f9ea29d188c5a1110f8750eb7ffb61a2f assets/hee/models/item/totem_of_undying.json
-5bfa4f6a4e99435e5fc3e85e54c50dfade0ca909 assets/hee/models/item/totem_of_undying_shaking.json
-dbca360ef1ad241c23e76fd4b521f9733fa594b3 assets/hee/models/item/trinket_pouch.json
-640fb723df4adaf9b0e055a7e45afa7756e5acb4 assets/hee/models/item/undread_spawn_egg.json
-640fb723df4adaf9b0e055a7e45afa7756e5acb4 assets/hee/models/item/vampire_bat_spawn_egg.json
+ba1c80a92d7fee3ef0ac9ba49af111d0feec9dfe assets/hee/models/item/talisman_of_griefing.json
+ab704d092bef3ecab0a1e994516845dd983b2243 assets/hee/models/item/ticking_core.json
+27c018ec00b0a8eb7310e94e7b16920d3f76ee8c assets/hee/models/item/totem_of_undying.json
+d125f4cfb387f50d46b5637f90c3cd7a7de3ef9b assets/hee/models/item/totem_of_undying_shaking.json
+0fefe52c42f433e8d897883a73b9b9c94a99b1de assets/hee/models/item/trinket_pouch.json
+98167609bf3898587f7565736a6fc24a7966cacd assets/hee/models/item/undread_spawn_egg.json
+98167609bf3898587f7565736a6fc24a7966cacd assets/hee/models/item/vampire_bat_spawn_egg.json
 30ed191345efaee5e2b9c45430afd4a1e8bab340 assets/hee/models/item/vantablock.json
-57a0c23898ab990b86858bf5b5f7a21dc51045cc assets/hee/models/item/void_bucket.json
-ece7abe596e867f0aac8b92ae3b2aadf8d00f51a assets/hee/models/item/void_bucket_fluid_level_1.json
-9e4a2766570f3f775cb9b86453cd2992e3baeb91 assets/hee/models/item/void_bucket_fluid_level_2.json
-accc1abdb6c2fa56f198831b975bcb7814112741 assets/hee/models/item/void_bucket_fluid_level_3.json
-90f044fb644937ade5dd134a2ab08d193b1392d6 assets/hee/models/item/void_bucket_fluid_level_4.json
-6ab14e054fca6411538eb59f6e47b9857670d888 assets/hee/models/item/void_essence.json
-6b047031855f93907e0ce7edd0c196976b8530a8 assets/hee/models/item/void_miner.json
+92a9db55e6464177ca9c242209352bd4608e1c84 assets/hee/models/item/void_bucket.json
+a050ad6411acc2bf50f1e0ad872496844848a164 assets/hee/models/item/void_bucket_fluid_level_1.json
+00c729c820027a3878e24170a4d78eb11bb13d66 assets/hee/models/item/void_bucket_fluid_level_2.json
+c09aeb29a39006d1c59162c162571b0f637c2b6d assets/hee/models/item/void_bucket_fluid_level_3.json
+2a6cb6406f772cb198d8cd57e78fc7d9bf57aec7 assets/hee/models/item/void_bucket_fluid_level_4.json
+86412ac81a6e74878a9d088886b19d44b54049f8 assets/hee/models/item/void_essence.json
+e535f71752dbfb11fe431940fd57deebaaf2362a assets/hee/models/item/void_miner.json
 25641d9b4a546204a6a8b76f8e4cfd7c109aa41f assets/hee/models/item/void_portal_frame.json
 719b4f2c19dc3453307a87f8f8b1c0185b65bc9e assets/hee/models/item/void_portal_frame_crafted.json
 890a9f625bff6bf3be0977ee0aca86818d7de714 assets/hee/models/item/void_portal_storage.json
 2484165b1f3a49fc3f82e8dd4657238172820f21 assets/hee/models/item/void_portal_storage_crafted.json
-cd4adaf6630298e0d85830b7dbaa3804e5f4e223 assets/hee/models/item/void_salad.json
-f45da5edd42098ee3e3cb6d172a5c41af67c5cd3 assets/hee/models/item/void_void_salad.json
+872f1af16f0f808450d7e8b8502977c129e51b50 assets/hee/models/item/void_salad.json
+099d3a7e6f2f31c02498126955826ab7b092aca9 assets/hee/models/item/void_void_salad.json
 a2c48f632b0f8a6fabeb2ac676e4ec390e57f784 assets/hee/models/item/whitebark.json
 aa8696fc83d73951a890f55cd7c2b9c9abb3f611 assets/hee/models/item/whitebark_log.json
 2a7519999fb2d2f4c2745aa2a6a5cc5a20111bb4 assets/hee/models/item/whitebark_planks.json
@@ -561,24 +567,24 @@ e66091a13a6e7593eb5bd971978d24a5a0e375b3 data/hee/loot_tables/blocks/whitebark.j
 7d84dc443a052e349593b71d2c0a523e75396cdf data/hee/loot_tables/blocks/whitebark_slab.json
 83e0b81adb3f9dd488397e8459b95f7b0ce19927 data/hee/loot_tables/blocks/whitebark_stairs.json
 f5996244831ab38fe1fae2f304bbd7825d6ad98b data/minecraft/tags/blocks/bamboo_plantable_on.json
-479189f9b35a3c8f795539daf6a1809130242c5b data/minecraft/tags/blocks/flower_pots.json
+74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/blocks/flower_pots.json
 424e2e03cf62f23f4496468a97b9f0df060df9fe data/minecraft/tags/blocks/impermeable.json
-4557912145f8c53493f249ef3961d02e156891e4 data/minecraft/tags/blocks/leaves.json
+74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/blocks/leaves.json
 4ea74ec750ba7360a7843a0d4a604ac7b35dfa96 data/minecraft/tags/blocks/logs.json
 697395021049c8cccfac2486c52eb6664cc5bad6 data/minecraft/tags/blocks/planks.json
 10fff7e5092ddc68cc1611ad4605dc4d6608e227 data/minecraft/tags/blocks/portals.json
-6f73d4c0d7c0f2650b498f35a60e8fe9c280c765 data/minecraft/tags/blocks/saplings.json
-eb69de8447077a713baaab7e10184ec283c25516 data/minecraft/tags/blocks/slabs.json
-07e3d7d270309424e1ab60a1b89ab2da85f800c7 data/minecraft/tags/blocks/stairs.json
-5318f9d9be9209139567f7f58d77d1b27d9d1327 data/minecraft/tags/blocks/walls.json
+74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/blocks/saplings.json
+74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/blocks/slabs.json
+74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/blocks/stairs.json
+74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/blocks/walls.json
 8a04ae43dc7062677394df7bf7276dbc92a5f1ca data/minecraft/tags/blocks/wooden_slabs.json
 3bf587d2f806c14a76a10db8f43386552382c381 data/minecraft/tags/blocks/wooden_stairs.json
-4557912145f8c53493f249ef3961d02e156891e4 data/minecraft/tags/items/leaves.json
+74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/leaves.json
 4ea74ec750ba7360a7843a0d4a604ac7b35dfa96 data/minecraft/tags/items/logs.json
 697395021049c8cccfac2486c52eb6664cc5bad6 data/minecraft/tags/items/planks.json
-6f73d4c0d7c0f2650b498f35a60e8fe9c280c765 data/minecraft/tags/items/saplings.json
-eb69de8447077a713baaab7e10184ec283c25516 data/minecraft/tags/items/slabs.json
-07e3d7d270309424e1ab60a1b89ab2da85f800c7 data/minecraft/tags/items/stairs.json
-5318f9d9be9209139567f7f58d77d1b27d9d1327 data/minecraft/tags/items/walls.json
+74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/saplings.json
+74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/slabs.json
+74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/stairs.json
+74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/walls.json
 8a04ae43dc7062677394df7bf7276dbc92a5f1ca data/minecraft/tags/items/wooden_slabs.json
 3bf587d2f806c14a76a10db8f43386552382c381 data/minecraft/tags/items/wooden_stairs.json

data/gen/assets/hee/blockstates/miners_burial_block_pillar.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "hee:block/miners_burial_block_pillar",
+      "model": "hee:block/miners_burial_block_pillar_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,7 +9,7 @@
       "model": "hee:block/miners_burial_block_pillar"
     },
     "axis=z": {
-      "model": "hee:block/miners_burial_block_pillar",
+      "model": "hee:block/miners_burial_block_pillar_horizontal",
       "x": 90
     }
   }

data/gen/assets/hee/blockstates/obsidian_pillar.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "hee:block/obsidian_pillar",
+      "model": "hee:block/obsidian_pillar_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,7 +9,7 @@
       "model": "hee:block/obsidian_pillar"
     },
     "axis=z": {
-      "model": "hee:block/obsidian_pillar",
+      "model": "hee:block/obsidian_pillar_horizontal",
       "x": 90
     }
   }

data/gen/assets/hee/blockstates/obsidian_pillar_lit.json

@@ -1,15 +1,15 @@
 {
   "variants": {
     "axis=x": {
-      "model": "hee:block/obsidian_pillar",
+      "model": "hee:block/obsidian_pillar_lit_horizontal",
       "x": 90,
       "y": 90
     },
     "axis=y": {
-      "model": "hee:block/obsidian_pillar"
+      "model": "hee:block/obsidian_pillar_lit"
     },
     "axis=z": {
-      "model": "hee:block/obsidian_pillar",
+      "model": "hee:block/obsidian_pillar_lit_horizontal",
       "x": 90
     }
   }

data/gen/assets/hee/blockstates/whitebark_log.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "axis=x": {
-      "model": "hee:block/whitebark_log",
+      "model": "hee:block/whitebark_log_horizontal",
       "x": 90,
       "y": 90
     },
@@ -9,7 +9,7 @@
       "model": "hee:block/whitebark_log"
     },
     "axis=z": {
-      "model": "hee:block/whitebark_log",
+      "model": "hee:block/whitebark_log_horizontal",
       "x": 90
     }
   }

data/gen/assets/hee/models/block/ancient_cobweb.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "textures": {
     "cross": "hee:block/ancient_cobweb"
   }

data/gen/assets/hee/models/block/autumn_leaves_brown.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/leaves",
+  "parent": "minecraft:block/leaves",
   "textures": {
     "all": "hee:block/autumn_leaves_brown"
   }

data/gen/assets/hee/models/block/autumn_leaves_orange.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/leaves",
+  "parent": "minecraft:block/leaves",
   "textures": {
     "all": "hee:block/autumn_leaves_orange"
   }

data/gen/assets/hee/models/block/autumn_leaves_red.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/leaves",
+  "parent": "minecraft:block/leaves",
   "textures": {
     "all": "hee:block/autumn_leaves_red"
   }

data/gen/assets/hee/models/block/autumn_leaves_yellowgreen.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/leaves",
+  "parent": "minecraft:block/leaves",
   "textures": {
     "all": "hee:block/autumn_leaves_yellowgreen"
   }

data/gen/assets/hee/models/block/autumn_sapling_brown.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "textures": {
     "cross": "hee:block/autumn_sapling_brown"
   }

data/gen/assets/hee/models/block/autumn_sapling_orange.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "textures": {
     "cross": "hee:block/autumn_sapling_orange"
   }

data/gen/assets/hee/models/block/autumn_sapling_red.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "textures": {
     "cross": "hee:block/autumn_sapling_red"
   }

data/gen/assets/hee/models/block/autumn_sapling_yellowgreen.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "textures": {
     "cross": "hee:block/autumn_sapling_yellowgreen"
   }

data/gen/assets/hee/models/block/cauldron_dragons_breath_level1.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cauldron_level1",
+  "parent": "minecraft:block/cauldron_level1",
   "textures": {
     "water": "hee:block/dragons_breath_still"
   }

data/gen/assets/hee/models/block/cauldron_dragons_breath_level2.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cauldron_level2",
+  "parent": "minecraft:block/cauldron_level2",
   "textures": {
     "water": "hee:block/dragons_breath_still"
   }

data/gen/assets/hee/models/block/cauldron_dragons_breath_level3.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cauldron_level3",
+  "parent": "minecraft:block/cauldron_level3",
   "textures": {
     "water": "hee:block/dragons_breath_still"
   }

data/gen/assets/hee/models/block/cauldron_ender_goo_level1.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cauldron_level1",
+  "parent": "minecraft:block/cauldron_level1",
   "textures": {
     "water": "hee:block/ender_goo_still"
   }

data/gen/assets/hee/models/block/cauldron_ender_goo_level2.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cauldron_level2",
+  "parent": "minecraft:block/cauldron_level2",
   "textures": {
     "water": "hee:block/ender_goo_still"
   }

data/gen/assets/hee/models/block/cauldron_ender_goo_level3.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cauldron_level3",
+  "parent": "minecraft:block/cauldron_level3",
   "textures": {
     "water": "hee:block/ender_goo_still"
   }

data/gen/assets/hee/models/block/cauldron_purified_ender_goo_level1.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cauldron_level1",
+  "parent": "minecraft:block/cauldron_level1",
   "textures": {
     "water": "hee:block/purified_ender_goo_still"
   }

data/gen/assets/hee/models/block/cauldron_purified_ender_goo_level2.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cauldron_level2",
+  "parent": "minecraft:block/cauldron_level2",
   "textures": {
     "water": "hee:block/purified_ender_goo_still"
   }

data/gen/assets/hee/models/block/cauldron_purified_ender_goo_level3.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cauldron_level3",
+  "parent": "minecraft:block/cauldron_level3",
   "textures": {
     "water": "hee:block/purified_ender_goo_still"
   }

data/gen/assets/hee/models/block/corrupted_energy.json

@@ -1,7 +1,7 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "ambientocclusion": false,
   "textures": {
-    "cross": "item/barrier"
+    "cross": "minecraft:item/barrier"
   }
 }

data/gen/assets/hee/models/block/dark_loam.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "hee:block/dark_loam"
   }

data/gen/assets/hee/models/block/dark_loam_slab.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/slab",
+  "parent": "minecraft:block/slab",
   "textures": {
     "side": "hee:block/dark_loam",
     "bottom": "hee:block/dark_loam",

data/gen/assets/hee/models/block/dark_loam_slab_top.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/slab_top",
+  "parent": "minecraft:block/slab_top",
   "textures": {
     "side": "hee:block/dark_loam",
     "bottom": "hee:block/dark_loam",

data/gen/assets/hee/models/block/death_flower_1.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "textures": {
     "cross": "hee:block/death_flower_1"
   }

data/gen/assets/hee/models/block/death_flower_2.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "textures": {
     "cross": "hee:block/death_flower_2"
   }

data/gen/assets/hee/models/block/death_flower_3.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "textures": {
     "cross": "hee:block/death_flower_3"
   }

data/gen/assets/hee/models/block/death_flower_4.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "textures": {
     "cross": "hee:block/death_flower_4"
   }

data/gen/assets/hee/models/block/death_flower_healed.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "textures": {
     "cross": "hee:block/death_flower_healed"
   }

data/gen/assets/hee/models/block/death_flower_withered.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cross",
+  "parent": "minecraft:block/cross",
   "textures": {
     "cross": "hee:block/death_flower_withered"
   }

data/gen/assets/hee/models/block/dusty_stone.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "hee:block/dusty_stone"
   }

data/gen/assets/hee/models/block/dusty_stone_brick_slab.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/slab",
+  "parent": "minecraft:block/slab",
   "textures": {
     "side": "hee:block/dusty_stone_bricks",
     "bottom": "hee:block/dusty_stone_bricks",

data/gen/assets/hee/models/block/dusty_stone_brick_slab_top.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/slab_top",
+  "parent": "minecraft:block/slab_top",
   "textures": {
     "side": "hee:block/dusty_stone_bricks",
     "bottom": "hee:block/dusty_stone_bricks",

data/gen/assets/hee/models/block/dusty_stone_brick_stairs.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/stairs",
+  "parent": "minecraft:block/stairs",
   "textures": {
     "side": "hee:block/dusty_stone_bricks",
     "bottom": "hee:block/dusty_stone_bricks",

data/gen/assets/hee/models/block/dusty_stone_brick_stairs_inner.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/inner_stairs",
+  "parent": "minecraft:block/inner_stairs",
   "textures": {
     "side": "hee:block/dusty_stone_bricks",
     "bottom": "hee:block/dusty_stone_bricks",

data/gen/assets/hee/models/block/dusty_stone_brick_stairs_outer.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/outer_stairs",
+  "parent": "minecraft:block/outer_stairs",
   "textures": {
     "side": "hee:block/dusty_stone_bricks",
     "bottom": "hee:block/dusty_stone_bricks",

data/gen/assets/hee/models/block/dusty_stone_bricks.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "hee:block/dusty_stone_bricks"
   }

data/gen/assets/hee/models/block/dusty_stone_cracked.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "hee:block/dusty_stone_cracked"
   }

data/gen/assets/hee/models/block/dusty_stone_cracked_bricks.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "hee:block/dusty_stone_cracked_bricks"
   }

data/gen/assets/hee/models/block/dusty_stone_damaged.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "hee:block/dusty_stone_damaged"
   }

data/gen/assets/hee/models/block/dusty_stone_decoration.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "hee:block/dusty_stone_decoration"
   }

data/gen/assets/hee/models/block/end_portal_acceptor.json

@@ -4,6 +4,6 @@
     "particle": "hee:block/end_portal_frame_side",
     "side": "hee:block/end_portal_frame_side",
     "top": "hee:block/end_portal_frame_top_acceptor",
-    "bottom": "block/end_stone"
+    "bottom": "minecraft:block/end_stone"
   }
 }

data/gen/assets/hee/models/block/end_portal_frame.json

@@ -4,6 +4,6 @@
     "particle": "hee:block/end_portal_frame_side",
     "side": "hee:block/end_portal_frame_side",
     "top": "hee:block/end_portal_frame_top_plain",
-    "bottom": "block/end_stone"
+    "bottom": "minecraft:block/end_stone"
   }
 }

data/gen/assets/hee/models/block/end_powder_ore.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "hee:block/end_powder_ore"
   }

data/gen/assets/hee/models/block/end_stone_burned.json

@@ -1,8 +1,8 @@
 {
-  "parent": "block/cube_bottom_top",
+  "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "side": "hee:block/end_stone_burned_side",
-    "bottom": "block/end_stone",
+    "bottom": "minecraft:block/end_stone",
     "top": "hee:block/end_stone_burned_top",
     "particle": "hee:block/end_stone_burned_top"
   }

data/gen/assets/hee/models/block/end_stone_enchanted.json

@@ -1,8 +1,8 @@
 {
-  "parent": "block/cube_bottom_top",
+  "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "side": "hee:block/end_stone_enchanted_side",
-    "bottom": "block/end_stone",
+    "bottom": "minecraft:block/end_stone",
     "top": "hee:block/end_stone_enchanted_top",
     "particle": "hee:block/end_stone_enchanted_top"
   }

data/gen/assets/hee/models/block/end_stone_infested.json

@@ -1,8 +1,8 @@
 {
-  "parent": "block/cube_bottom_top",
+  "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "side": "hee:block/end_stone_infested_side",
-    "bottom": "block/end_stone",
+    "bottom": "minecraft:block/end_stone",
     "top": "hee:block/end_stone_infested_top",
     "particle": "hee:block/end_stone_infested_top"
   }

data/gen/assets/hee/models/block/endersol.json

@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_column",
+  "parent": "minecraft:block/cube_column",
   "textures": {
     "side": "hee:block/endersol",
     "end": "hee:block/endersol_top"

data/gen/assets/hee/models/block/endersol_merge_1.json

@@ -1,8 +1,8 @@
 {
-  "parent": "block/cube_bottom_top",
+  "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "side": "hee:block/endersol_merge_1",
-    "bottom": "block/end_stone",
+    "bottom": "minecraft:block/end_stone",
     "top": "hee:block/endersol_top"
   }
 }

data/gen/assets/hee/models/block/endersol_merge_2.json

@@ -1,8 +1,8 @@
 {
-  "parent": "block/cube_bottom_top",
+  "parent": "minecraft:block/cube_bottom_top",
   "textures": {
     "side": "hee:block/endersol_merge_2",
-    "bottom": "block/end_stone",
+    "bottom": "minecraft:block/end_stone",
     "top": "hee:block/endersol_top"
   }
 }