Make neoforge creative tab checker happy

src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java

@@ -125,6 +125,7 @@ public final class OverdriveThatMatters {
 		MDataComponentTypes.INSTANCE.register(bus);
 		MArmorMaterials.INSTANCE.register(bus);
 		MCriteriaTriggers.INSTANCE.register(bus);
+		MStats.INSTANCE.register(bus);
 
 		StorageStack.Companion.register(bus);
 		MatteryChestMenu.Companion.register(bus);

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt

@@ -532,7 +532,7 @@ abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: Bloc
 			tickingMap.clear()
 		}
 
-		fun postLevelTick(event: LevelTickEvent) {
+		fun postLevelTick(event: LevelTickEvent.Post) {
 			val level = event.level as? ServerLevel ?: return
 
 			tickingMap[level]?.forEach {

src/main/kotlin/ru/dbotthepony/mc/otm/client/render/DynamicBufferSource.kt

@@ -106,7 +106,7 @@ class DynamicBufferSource(
 				this.chained = chained
 			}
 
-			buffers[type] = this
+			require(buffers.put(type, this) == null) { "Duplicate render type: $type" }
 			bufferList.add(this)
 		}
 
@@ -164,7 +164,7 @@ class DynamicBufferSource(
 		next = State(Sheets.bedSheet(), ImmutableList.of(next.type), immutableAfter = true, chained = false)
 		next = State(Sheets.shulkerBoxSheet(), ImmutableList.of(next.type), immutableAfter = true, chained = false)
 		next = State(Sheets.signSheet(), ImmutableList.of(next.type), immutableAfter = true, chained = false)
-		next = State(Sheets.hangingSignSheet(), ImmutableList.of(next.type), immutableAfter = true, chained = false)
+		//next = State(Sheets.hangingSignSheet(), ImmutableList.of(next.type), immutableAfter = true, chained = false)
 		next = State(Sheets.chestSheet(), ImmutableList.of(next.type), immutableAfter = true, chained = false)
 		next = State(RenderType.armorEntityGlint(), ImmutableList.of(next.type), immutableAfter = true, chained = false)
 		next = State(RenderType.glint(), ImmutableList.of(next.type), immutableAfter = true, chained = false)

src/main/kotlin/ru/dbotthepony/mc/otm/container/IMatteryContainer.kt

@@ -225,7 +225,7 @@ interface IMatteryContainer : IContainer, RecipeInput, Iterable<ItemStack> {
 		val list = ArrayList<ItemStack>(size())
 
 		for (i in 0 until size()) {
-			list[i] = this[i]
+			list.add(this[i])
 		}
 
 		return list

src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt

@@ -212,7 +212,7 @@ fun FriendlyByteBuf.writeItemType(value: Item) {
 }
 
 fun RegistryFriendlyByteBuf.writeItem(value: ItemStack) {
-	ItemStack.STREAM_CODEC.encode(this, value)
+	ItemStack.OPTIONAL_STREAM_CODEC.encode(this, value)
 }
 
 fun RegistryFriendlyByteBuf.writeComponent(value: Component) {
@@ -228,7 +228,7 @@ fun FriendlyByteBuf.readItemType(): Item {
 }
 
 fun RegistryFriendlyByteBuf.readItem(): ItemStack {
-	return ItemStack.STREAM_CODEC.decode(this)
+	return ItemStack.OPTIONAL_STREAM_CODEC.decode(this)
 }
 
 fun RegistryFriendlyByteBuf.readComponent(): Component {

src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Decimal.kt

@@ -701,6 +701,14 @@ sealed class Decimal : Number(), Comparable<Decimal> {
 		override val isFinite: Boolean
 			get() = false
 
+		override fun equals(other: Any?): Boolean {
+			return this === other
+		}
+
+		override fun hashCode(): Int {
+			return super.hashCode()
+		}
+
 		override fun compareTo(other: Decimal): Int {
 			return if (other === this) 0 else 1
 		}
@@ -942,6 +950,14 @@ sealed class Decimal : Number(), Comparable<Decimal> {
 		override val isFinite: Boolean
 			get() = false
 
+		override fun equals(other: Any?): Boolean {
+			return this === other
+		}
+
+		override fun hashCode(): Int {
+			return super.hashCode()
+		}
+
 		override fun compareTo(other: Decimal): Int {
 			return if (other === this) 0 else -1
 		}
@@ -1177,6 +1193,14 @@ sealed class Decimal : Number(), Comparable<Decimal> {
 		override val isFinite: Boolean
 			get() = true
 
+		override fun equals(other: Any?): Boolean {
+			return this === other || other is Decimal && other.isZero
+		}
+
+		override fun hashCode(): Int {
+			return super.hashCode()
+		}
+
 		override fun compareTo(other: Decimal): Int {
 			return -other.signum()
 		}

src/main/kotlin/ru/dbotthepony/mc/otm/network/DelegateSyncher.kt

@@ -626,15 +626,15 @@ class DelegateSyncher : Observer {
 	}
 
 	fun item(value: ItemStack = ItemStack.EMPTY, setter: DelegateSetter<ItemStack> = DelegateSetter.passthrough(), getter: DelegateGetter<ItemStack> = DelegateGetter.passthrough()): DelegateSyncher.Slot<ItemStack> {
-		return add(ListenableDelegate.maskSmart(value, getter, setter), ItemStack.STREAM_CODEC.wrap())
+		return add(ListenableDelegate.maskSmart(value, getter, setter), ItemStack.OPTIONAL_STREAM_CODEC.wrap())
 	}
 
 	fun computedItem(delegate: Supplier<ItemStack>): DelegateSyncher.Slot<ItemStack> {
-		return computed(delegate, ItemStack.STREAM_CODEC.wrap())
+		return computed(delegate, ItemStack.OPTIONAL_STREAM_CODEC.wrap())
 	}
 
 	fun observedItem(value: ItemStack = ItemStack.EMPTY, setter: DelegateSetter<ItemStack> = DelegateSetter.passthrough(), getter: DelegateGetter<ItemStack> = DelegateGetter.passthrough()): DelegateSyncher.ObservedSlot<ItemStack> {
-		return add(Delegate.maskSmart(value, getter, setter), ItemStack.STREAM_CODEC.wrap())
+		return add(Delegate.maskSmart(value, getter, setter), ItemStack.OPTIONAL_STREAM_CODEC.wrap())
 	}
 
 	/**

src/main/kotlin/ru/dbotthepony/mc/otm/network/Ext.kt

@@ -34,11 +34,11 @@ inline fun encodePayload(registry: RegistryAccess, block: (RegistryFriendlyByteB
 
 	try {
 		block.invoke(buf)
+		buf.readerIndex(0)
 
-		val bytes = ByteArrayList(buf.readableBytes())
-		check(bytes.size == buf.readableBytes())
-		buf.readBytes(bytes.elements())
-		return bytes
+		val bytes = ByteArray(buf.readableBytes())
+		buf.readBytes(bytes)
+		return ByteArrayList.wrap(bytes)
 	} finally {
 		underlying.release()
 	}

src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt

@@ -77,14 +77,16 @@ private fun CreativeModeTab.Output.all(values: Map<DyeColor?, Item>) {
 }
 
 private fun CreativeModeTab.Output.energized(value: Item) {
-	accept(value)
+	val empty = ItemStack(value, 1)
+	accept(empty)
 
-	val stack = ItemStack(value, 1)
-	val energy = stack.matteryEnergy ?: throw IllegalArgumentException("${value.registryName} does not implement mattery energy capability")
+	val full = empty.copy()
+	val energy = full.matteryEnergy ?: throw IllegalArgumentException("${value.registryName} does not implement mattery energy capability")
 	energy.fillBattery()
 
-	if (ItemStack(value, 1).matteryEnergy!!.batteryLevel != energy.batteryLevel)
-		accept(stack)
+	// FIXME
+	if (ItemStack(value, 1).matteryEnergy!!.batteryLevel != energy.batteryLevel && !ItemStack.isSameItemSameComponents(empty, full))
+		accept(full)
 }
 
 private fun CreativeModeTab.Output.energized(values: Iterable<Item>) {
@@ -94,15 +96,17 @@ private fun CreativeModeTab.Output.energized(values: Iterable<Item>) {
 }
 
 private fun CreativeModeTab.Output.mattery(value: Item) {
-	accept(value)
+	val empty = ItemStack(value, 1)
+	accept(empty)
 
-	val stack = ItemStack(value, 1)
-	val matter = stack.getCapability(MatteryCapability.MATTER_ITEM) ?: throw IllegalArgumentException("${value.registryName} does not implement matter capability")
+	val full = empty.copy()
+	val matter = full.getCapability(MatteryCapability.MATTER_ITEM) ?: throw IllegalArgumentException("${value.registryName} does not implement matter capability")
 
 	matter.fillMatter()
 
-	if (ItemStack(value, 1).getCapability(MatteryCapability.MATTER_ITEM)!!.storedMatter != matter.storedMatter)
-		accept(stack)
+	// FIXME
+	if (ItemStack(value, 1).getCapability(MatteryCapability.MATTER_ITEM)!!.storedMatter != matter.storedMatter && !ItemStack.isSameItemSameComponents(empty, full))
+		accept(full)
 }
 
 private fun CreativeModeTab.Output.mattery(values: Iterable<Item>) {

src/main/kotlin/ru/dbotthepony/mc/otm/registry/MStats.kt

@@ -1,20 +1,29 @@
 package ru.dbotthepony.mc.otm.registry
 
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.stats.StatFormatter
 import net.minecraft.stats.Stats
+import net.neoforged.bus.api.IEventBus
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent
 import ru.dbotthepony.mc.otm.registry.StatNames.DAMAGE_ABSORBED
 import ru.dbotthepony.mc.otm.registry.StatNames.HEALTH_REGENERATED
 import ru.dbotthepony.mc.otm.registry.StatNames.POWER_CONSUMED
 
 object MStats {
+	private val registrar = MDeferredRegister(BuiltInRegistries.CUSTOM_STAT)
+
+	fun register(bus: IEventBus) {
+		registrar.register(bus)
+	}
+
+	init {
+		registrar.register(DAMAGE_ABSORBED, DAMAGE_ABSORBED)
+		registrar.register(HEALTH_REGENERATED, HEALTH_REGENERATED)
+		registrar.register(POWER_CONSUMED, POWER_CONSUMED)
+	}
+
 	fun registerVanilla(event: FMLCommonSetupEvent) {
 		event.enqueueWork {
-			Registry.register(BuiltInRegistries.CUSTOM_STAT, DAMAGE_ABSORBED, DAMAGE_ABSORBED)
-			Registry.register(BuiltInRegistries.CUSTOM_STAT, HEALTH_REGENERATED, HEALTH_REGENERATED)
-			Registry.register(BuiltInRegistries.CUSTOM_STAT, POWER_CONSUMED, POWER_CONSUMED)
 			Stats.CUSTOM[DAMAGE_ABSORBED, StatFormatter.DIVIDE_BY_TEN]
 			Stats.CUSTOM[HEALTH_REGENERATED, StatFormatter.DIVIDE_BY_TEN]
 			Stats.CUSTOM[POWER_CONSUMED, StatFormatter.DIVIDE_BY_TEN]

src/main/resources/assets/overdrive_that_matters/models/block/android_charger_base.json

@@ -94,7 +94,7 @@
 				"south": {"uv": [8, 9, 12, 10.25], "texture": "#0"},
 				"west": {"uv": [8, 9, 12, 10.25], "texture": "#0"}
 			},
-      "forge_data": {
+      "neoforge_data": {
         "block_light": 15
       }
 		},

src/main/resources/assets/overdrive_that_matters/models/block/android_charger_middle.json

@@ -17,7 +17,7 @@
 				"south": {"uv": [8, 9, 12, 13], "texture": "#0"},
 				"west": {"uv": [8, 9, 12, 13], "texture": "#0"}
 			},
-      "forge_data": {
+      "neoforge_data": {
         "block_light": 15
       }
 		},

src/main/resources/assets/overdrive_that_matters/models/block/android_charger_top.json

@@ -14,7 +14,7 @@
 			"faces": {
 				"north": {"uv": [11, 2.25, 12.5, 4.75], "rotation": 90, "texture": "#0"}
 			},
-      "forge_data": {
+      "neoforge_data": {
         "block_light": 15
       }
 		},
@@ -72,7 +72,7 @@
 				"south": {"uv": [8, 11.75, 12, 13], "texture": "#0"},
 				"west": {"uv": [8, 11.75, 12, 13], "texture": "#0"}
 			},
-      "forge_data": {
+      "neoforge_data": {
         "block_light": 15
       }
 		},

src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json

@@ -34,7 +34,7 @@
 				"up": {"uv": [8, 0, 16, 4], "texture": "#1"},
 				"down": {"uv": [8, 4.5, 16, 8.5], "texture": "#1"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "base",
@@ -72,7 +72,7 @@
 				"up": {"uv": [9, 5, 15, 8], "texture": "#1"},
 				"down": {"uv": [9, 5, 15, 8], "texture": "#1"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "frame",
@@ -126,7 +126,7 @@
 				"up": {"uv": [0, 9.5, 8, 13.5], "texture": "#1"},
 				"down": {"uv": [0, 9.5, 8, 13.5], "texture": "#1"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "hologram",
@@ -136,7 +136,7 @@
 				"up": {"uv": [11, 11, 13, 12], "texture": "#1"},
 				"down": {"uv": [11, 11, 13, 12], "texture": "#1"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "holotext",
@@ -147,7 +147,7 @@
 				"north": {"uv": [2.5, 7.25, 5.5, 8.25], "texture": "#1"},
 				"south": {"uv": [5.5, 7.25, 2.5, 8.25], "texture": "#1"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "holotext",

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery0.json

@@ -23,7 +23,7 @@
 			"from": [11, 2, 1],
 			"to": [13, 7, 1],
 			"faces": {
-				"north": {"uv": [1.5, 3, 2.5, 8], "texture": "#1", "forge_data": {"block_light": 15}},
+				"north": {"uv": [1.5, 3, 2.5, 8], "texture": "#1", "neoforge_data": {"block_light": 15}},
 				"east": {"uv": [0, 0, 0, 5], "texture": "#missing"},
 				"south": {"uv": [0, 0, 1, 5], "texture": "#missing"},
 				"west": {"uv": [0, 0, 0, 5], "texture": "#missing"},

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery1.json

@@ -92,7 +92,7 @@
           ]
         },
         "north": {
-          "forge_data": {
+          "neoforge_data": {
             "block_light": 15
           },
           "texture": "#1",

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery10.json

@@ -101,7 +101,7 @@
           ]
         },
         "south": {
-          "forge_data": {
+          "neoforge_data": {
             "block_light": 15
           },
           "texture": "#1",

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery11.json

@@ -101,7 +101,7 @@
           ]
         },
         "south": {
-          "forge_data": {
+          "neoforge_data": {
             "block_light": 15
           },
           "texture": "#1",

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery2.json

@@ -92,7 +92,7 @@
           ]
         },
         "north": {
-          "forge_data": {
+          "neoforge_data": {
             "block_light": 15
           },
           "texture": "#1",

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery3.json

@@ -92,7 +92,7 @@
           ]
         },
         "north": {
-          "forge_data": {
+          "neoforge_data": {
             "block_light": 15
           },
           "texture": "#1",

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery4.json

@@ -92,7 +92,7 @@
           ]
         },
         "north": {
-          "forge_data": {
+          "neoforge_data": {
             "block_light": 15
           },
           "texture": "#1",

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery5.json

@@ -92,7 +92,7 @@
           ]
         },
         "north": {
-          "forge_data": {
+          "neoforge_data": {
             "block_light": 15
           },
           "texture": "#1",

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery6.json

@@ -26,7 +26,7 @@
 			"faces": {
 				"north": {"uv": [0, 0, 1, 5], "texture": "#missing"},
 				"east": {"uv": [0, 0, 0, 5], "texture": "#missing"},
-				"south": {"uv": [2, 3, 3, 8], "texture": "#1", "forge_data": {"block_light": 15}},
+				"south": {"uv": [2, 3, 3, 8], "texture": "#1", "neoforge_data": {"block_light": 15}},
 				"west": {"uv": [0, 0, 0, 5], "texture": "#missing"},
 				"up": {"uv": [0, 0, 1, 0], "texture": "#missing"},
 				"down": {"uv": [0, 0, 1, 0], "texture": "#missing"}

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery7.json

@@ -101,7 +101,7 @@
           ]
         },
         "south": {
-          "forge_data": {
+          "neoforge_data": {
             "block_light": 15
           },
           "texture": "#1",

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery8.json

@@ -101,7 +101,7 @@
           ]
         },
         "south": {
-          "forge_data": {
+          "neoforge_data": {
             "block_light": 15
           },
           "texture": "#1",

src/main/resources/assets/overdrive_that_matters/models/block/battery/battery9.json

@@ -101,7 +101,7 @@
           ]
         },
         "south": {
-          "forge_data": {
+          "neoforge_data": {
             "block_light": 15
           },
           "texture": "#1",

src/main/resources/assets/overdrive_that_matters/models/block/essence_storage_filled.json

@@ -99,7 +99,7 @@
 				"north": {"uv": [7.5, 3, 14.5, 11], "texture": "#1"},
 				"west": {"uv": [1.5, 3, 8.5, 11], "texture": "#1"}
 			},
-			"forge_data": {
+			"neoforge_data": {
 				"block_light": 15,
 				"sky_light": 15
 			}

src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json

@@ -77,7 +77,7 @@
 			"from": [14, 14, 9.99],
 			"to": [15, 15, 9.99],
 			"faces": {
-				"north": {"uv": [8.5, 8.5, 9, 9], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0}
+				"north": {"uv": [8.5, 8.5, 9, 9], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
 			}
 		},
 		{
@@ -85,7 +85,7 @@
 			"from": [1, 14, 9.99],
 			"to": [2, 15, 9.99],
 			"faces": {
-				"north": {"uv": [15, 8.5, 15.5, 9], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0}
+				"north": {"uv": [15, 8.5, 15.5, 9], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
 			}
 		},
 		{
@@ -93,7 +93,7 @@
 			"from": [1, 1, 9.99],
 			"to": [2, 2, 9.99],
 			"faces": {
-				"north": {"uv": [15, 15, 15.5, 15.5], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0}
+				"north": {"uv": [15, 15, 15.5, 15.5], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
 			}
 		},
 		{
@@ -101,7 +101,7 @@
 			"from": [14, 1, 9.99],
 			"to": [15, 2, 9.99],
 			"faces": {
-				"north": {"uv": [8.5, 15, 9, 15.5], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0}
+				"north": {"uv": [8.5, 15, 9, 15.5], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
 			}
 		},
 		{
@@ -109,7 +109,7 @@
 			"from": [2.01, 6, 9],
 			"to": [2.01, 10, 10],
 			"faces": {
-				"east": {"uv": [1.5, 13, 2, 15], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0}
+				"east": {"uv": [1.5, 13, 2, 15], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
 			}
 		},
 		{
@@ -117,7 +117,7 @@
 			"from": [13.99, 6, 9],
 			"to": [13.99, 10, 10],
 			"faces": {
-				"west": {"uv": [1.5, 13, 2, 15], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0}
+				"west": {"uv": [1.5, 13, 2, 15], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0}
 			}
 		}
 	],

src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_error.json

@@ -42,7 +42,7 @@
 				"up": {"uv": [0, 0, 0, 0], "texture": "#texture"},
 				"down": {"uv": [0, 0, 0, 0], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"from": [1, 3, 9],
@@ -80,7 +80,7 @@
 				"up": {"uv": [0, 0, 0, 0], "texture": "#texture"},
 				"down": {"uv": [0, 0, 0, 0], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"from": [1, 12, 1],

src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_idle.json

@@ -51,7 +51,7 @@
 				"south": {"uv": [0, 5, 1.5, 6.75], "texture": "#texture"},
 				"west": {"uv": [0, 5, 1.5, 6.75], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"from": [1, 3, 1],
@@ -83,7 +83,7 @@
 				"south": {"uv": [0, 5, 1.5, 6.75], "texture": "#texture"},
 				"west": {"uv": [0, 5, 1.5, 6.75], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"from": [1, 12, 9],

src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json

@@ -42,7 +42,7 @@
 				"up": {"uv": [0, 0, 0, 0], "texture": "#texture"},
 				"down": {"uv": [0, 0, 0, 0], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"from": [1, 3, 9],
@@ -80,7 +80,7 @@
 				"up": {"uv": [0, 0, 0, 0], "texture": "#texture"},
 				"down": {"uv": [0, 0, 0, 0], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"from": [1, 12, 1],

src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json

@@ -131,7 +131,7 @@
 				"south": {"uv": [8.25, 2, 11, 4], "texture": "#0"},
 				"down": {"uv": [8.25, 2, 11, 4], "texture": "#0"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "manipulator",
@@ -169,7 +169,7 @@
 				"west": {"uv": [9.25, 4.5, 9.5, 5], "texture": "#0"},
 				"down": {"uv": [9.5, 4.5, 9.75, 5], "texture": "#0"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "manipulator",

src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json

@@ -67,7 +67,7 @@
 				"south": {"uv": [11, 0, 15.5, 2], "texture": "#texture"},
 				"up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "canister",
@@ -111,7 +111,7 @@
 				"up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"},
 				"down": {"uv": [0, 0, 6, 1], "texture": "#missing"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "canister",

src/main/resources/assets/overdrive_that_matters/models/block/painter.json

@@ -107,7 +107,7 @@
 			"faces": {
 				"north": {"uv": [4, 0, 5, 2], "texture": "#0"}
 			},
-		  "forge_data": {
+		  "neoforge_data": {
 			"block_light": 15
 		  }
 		},

src/main/resources/assets/overdrive_that_matters/models/block/powered_blast_furnace_error.json

@@ -17,7 +17,7 @@
 				"up": {"uv": [0, 0, 7, 1], "texture": "#texture"},
 				"down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "heatsink",
@@ -30,7 +30,7 @@
 				"up": {"uv": [0, 0, 7, 1], "texture": "#texture"},
 				"down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "heatsink",
@@ -43,7 +43,7 @@
 				"up": {"uv": [0, 0, 7, 1], "texture": "#texture"},
 				"down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "base",
@@ -163,7 +163,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -173,7 +173,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -183,7 +183,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -193,7 +193,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -203,7 +203,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -213,7 +213,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -222,7 +222,7 @@
 			"faces": {
 				"up": {"uv": [12.5, 1.5, 15.5, 1.75], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		}
 	],
 	"display": {

src/main/resources/assets/overdrive_that_matters/models/block/powered_blast_furnace_working.json

@@ -18,7 +18,7 @@
 				"up": {"uv": [0, 0, 7, 1], "texture": "#texture"},
 				"down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "heatsink",
@@ -31,7 +31,7 @@
 				"up": {"uv": [0, 0, 7, 1], "texture": "#texture"},
 				"down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "heatsink",
@@ -44,7 +44,7 @@
 				"up": {"uv": [0, 0, 7, 1], "texture": "#texture"},
 				"down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "base",
@@ -164,7 +164,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -174,7 +174,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -184,7 +184,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -194,7 +194,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -204,7 +204,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -214,7 +214,7 @@
 				"east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"},
 				"west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		},
 		{
 			"name": "light",
@@ -223,7 +223,7 @@
 			"faces": {
 				"up": {"uv": [12.5, 1.5, 15.5, 1.75], "texture": "#texture"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		}
 	],
 	"display": {

src/main/resources/assets/overdrive_that_matters/models/block/powered_furnace_working.json

@@ -317,7 +317,7 @@
 			"faces": {
 				"north": {"uv": [4.25, 10, 7.75, 13], "texture": "#0"}
 			},
-			"forge_data": { "block_light": 15, "sky_light": 15 }
+			"neoforge_data": { "block_light": 15, "sky_light": 15 }
 		}
 	],
 	"display": {

src/main/resources/assets/overdrive_that_matters/models/item/android_charger.json

@@ -94,7 +94,7 @@
 				"south": {"uv": [8, 9, 12, 10.25], "texture": "#0"},
 				"west": {"uv": [8, 9, 12, 10.25], "texture": "#0"}
 			},
-      "forge_data": {
+      "neoforge_data": {
         "block_light": 15
       }
 		},
@@ -151,7 +151,7 @@
 				"south": {"uv": [8, 9, 12, 13], "texture": "#0"},
 				"west": {"uv": [8, 9, 12, 13], "texture": "#0"}
 			},
-      "forge_data": {
+      "neoforge_data": {
         "block_light": 15
       }
 		},
@@ -260,7 +260,7 @@
 			"faces": {
 				"north": {"uv": [11, 2.25, 12.5, 4.75], "rotation": 90, "texture": "#0"}
 			},
-      "forge_data": {
+      "neoforge_data": {
         "block_light": 15
       }
 		},
@@ -318,7 +318,7 @@
 				"south": {"uv": [8, 11.75, 12, 13], "texture": "#0"},
 				"west": {"uv": [8, 11.75, 12, 13], "texture": "#0"}
 			},
-      "forge_data": {
+      "neoforge_data": {
         "block_light": 15
       }
 		},

src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json

@@ -1,5 +1,5 @@
 {
-	"loader": "forge:separate_transforms",
+	"loader": "neoforge:separate_transforms",
 	"gui_light": "front",
 	"base":
 	{

src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json

@@ -1,5 +1,5 @@
 {
-  "loader": "forge:separate_transforms",
+  "loader": "neoforge:separate_transforms",
   "gui_light": "front",
   "base":
   {
@@ -267,7 +267,7 @@
           "up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1"},
           "down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"}
         },
-        "forge_data": { "block_light": 15, "sky_light": 15 }
+        "neoforge_data": { "block_light": 15, "sky_light": 15 }
       },
       {
         "name": "capacitor",

src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer.json

@@ -1,5 +1,5 @@
 {
-	"loader": "forge:separate_transforms",
+	"loader": "neoforge:separate_transforms",
 	"gui_light": "front",
 	"base":
 	{

src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer_charging.json

@@ -1,5 +1,5 @@
 {
-  "loader": "forge:separate_transforms",
+  "loader": "neoforge:separate_transforms",
   "gui_light": "front",
   "base":
   {

src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer_primed.json

@@ -1,5 +1,5 @@
 {
-	"loader": "forge:separate_transforms",
+	"loader": "neoforge:separate_transforms",
 	"gui_light": "front",
 	"base":
 	{

src/main/resources/assets/overdrive_that_matters/models/item/fluid_capsule.json

@@ -1,6 +1,6 @@
 {
   "parent": "forge:item/default",
-  "loader": "forge:fluid_container",
+  "loader": "neoforge:fluid_container",
   "fluid": "minecraft:empty",
   "textures": {
     "base": "overdrive_that_matters:item/fluid_capsule",

src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle.json

@@ -1,5 +1,5 @@
 {
-	"loader": "forge:separate_transforms",
+	"loader": "neoforge:separate_transforms",
 	"gui_light": "front",
 	"base": {
 		"parent": "minecraft:item/handheld",

src/main/resources/coremods/code_injector.js

@@ -680,9 +680,9 @@ function initializeCoreMod() {
 				'methodDesc': '(Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;)V'
 			},
 			'transformer': patchBlendFunc
-		},
+		}//,
 
-		'LevelRenderer DynamicBufferSource callback': {
+		/*'LevelRenderer DynamicBufferSource callback': {
 			'target': {
 				'type': 'METHOD',
 				'class': 'net.minecraft.client.renderer.LevelRenderer',
@@ -730,6 +730,6 @@ function initializeCoreMod() {
 
 				return node
 			}
-		}
+		}*/
 	}
 }