Move some of the loose classes into better places

src/main/java/org/violetmoon/quark/QuarkForgeCapabilities.java → src/main/java/org/violetmoon/quark/base/capability/QuarkForgeCapabilities.java

@@ -1,4 +1,4 @@
-package org.violetmoon.quark;
+package org.violetmoon.quark.base.capability;
 
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityManager;

src/main/java/org/violetmoon/quark/base/handler/QuarkRemapHandler.java

@@ -0,0 +1,54 @@
+package org.violetmoon.quark.base.handler;
+
+import net.minecraft.core.DefaultedRegistry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.registries.MissingMappingsEvent;
+import org.violetmoon.quark.base.Quark;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Mod.EventBusSubscriber
+public class QuarkRemapHandler {
+	//datafixers could have also been used here but good luck figuring them out
+
+	private static final Map<String, String> REMAP = new HashMap<>();
+
+	static {
+		REMAP.put("quark:crafter", "minecraft:crafter");
+		REMAP.put("quark:polished_tuff", "minecraft:polished_tuff");
+		REMAP.put("quark:bamboo_planks_slab", "minecraft:bamboo_planks_slab");
+		REMAP.put("quark:bamboo_planks_stairs", "minecraft:bamboo_planks_stairs");
+		REMAP.put("quark:bamboo_fence", "minecraft:bamboo_fence");
+		REMAP.put("quark:bamboo_fence_gate", "minecraft:bamboo_fence_gate");
+		REMAP.put("quark:bamboo_door", "minecraft:bamboo_door");
+		REMAP.put("quark:bamboo_trapdoor", "minecraft:bamboo_trapdoor");
+		REMAP.put("quark:bamboo_button", "minecraft:bamboo_button");
+		REMAP.put("quark:bamboo_pressure_plate", "minecraft:bamboo_pressure_plate");
+		REMAP.put("quark:bamboo_bookshelf", "minecraft:bamboo_bookshelf");
+		REMAP.put("quark:bamboo_sign", "minecraft:bamboo_sign");
+		REMAP.put("quark:bamboo_mosaic", "minecraft:bamboo_mosaic");
+		REMAP.put("quark:bamboo_block", "minecraft:bamboo_block");
+		REMAP.put("quark:stripped_bamboo_block", "minecraft:stripped_bamboo_block");
+	}
+
+	@SubscribeEvent
+	public static void onRemapBlocks(MissingMappingsEvent event) {
+		remapAll(event, BuiltInRegistries.BLOCK);
+		remapAll(event, BuiltInRegistries.ITEM);
+	}
+
+
+	private static <T> void remapAll(MissingMappingsEvent event, DefaultedRegistry<T> block) {
+		for (var v : event.getMappings(block.key(), Quark.MOD_ID)) {
+			String rem = REMAP.get(v.getKey().toString());
+			if (rem != null) {
+				var b = block.getOptional(new ResourceLocation(rem));
+				b.ifPresent(v::remap);
+			} else v.ignore();
+		}
+	}
+}

src/main/java/org/violetmoon/quark/base/proxy/CommonProxy.java

@@ -15,10 +15,10 @@
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 import org.jetbrains.annotations.Nullable;
-import org.violetmoon.quark.QuarkForgeCapabilities;
 import org.violetmoon.quark.api.*;
 import org.violetmoon.quark.base.Quark;
 import org.violetmoon.quark.base.capability.CapabilityHandler;
+import org.violetmoon.quark.base.capability.QuarkForgeCapabilities;
 import org.violetmoon.quark.base.config.QuarkGeneralConfig;
 import org.violetmoon.quark.base.handler.*;
 import org.violetmoon.quark.base.network.QuarkNetwork;