Roundels!

src/main/java/dev/amble/ait/AITMod.java

@@ -39,6 +39,8 @@
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
+import net.minecraft.resource.featuretoggle.FeatureSet;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Identifier;
@@ -64,6 +66,8 @@
 import dev.amble.ait.core.likes.ItemOpinionRegistry;
 import dev.amble.ait.core.lock.LockedDimensionRegistry;
 import dev.amble.ait.core.loot.SetBlueprintLootFunction;
+import dev.amble.ait.core.roundels.RoundelPatterns;
+import dev.amble.ait.core.screens.RoundelFabricatorScreenHandler;
 import dev.amble.ait.core.sounds.flight.FlightSoundRegistry;
 import dev.amble.ait.core.sounds.travel.TravelSoundRegistry;
 import dev.amble.ait.core.tardis.animation.v2.blockbench.BlockbenchParser;
@@ -90,7 +94,6 @@
 import dev.amble.ait.registry.impl.exterior.ExteriorVariantRegistry;
 
 public class AITMod implements ModInitializer {
-
     public static final String MOD_ID = "ait";
     public static final Logger LOGGER = LoggerFactory.getLogger("ait");
     public static final Random RANDOM = new Random();
@@ -102,6 +105,11 @@ public class AITMod implements ModInitializer {
     public static final GameRules.Key<GameRules.BooleanRule> TARDIS_FIRE_GRIEFING = GameRuleRegistry.register("tardisFireGriefing",
             GameRules.Category.MISC, GameRuleFactory.createBooleanRule(false));
 
+    // Screens
+    public static final ScreenHandlerType<RoundelFabricatorScreenHandler> ROUNDEL_FABRICATOR_HANDLER = Registry.register(Registries.SCREEN_HANDLER,
+            AITMod.id("roundel_fabricator"),
+            new ScreenHandlerType<>(RoundelFabricatorScreenHandler::new, FeatureSet.empty()));
+
 
     public static final RegistryKey<PlacedFeature> CUSTOM_GEODE_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE,
             new Identifier(MOD_ID, "zeiton_geode"));
@@ -164,6 +172,8 @@ public void onInitialize() {
                 SubSystemRegistry.getInstance(),
                 ItemOpinionRegistry.getInstance(),
                 DrinkRegistry.getInstance(),
+                RoundelPatterns.getInstance(),
+                DrinkRegistry.getInstance(),
                 TardisAnimationRegistry.getInstance(),
                 DoorRegistry.getInstance()
         );

src/main/java/dev/amble/ait/client/AITModClient.java

@@ -1,5 +1,46 @@
 package dev.amble.ait.client;
 
+import static dev.amble.ait.AITMod.*;
+import static dev.amble.ait.core.AITItems.isUnlockedOnThisDay;
+import static dev.amble.ait.core.item.PersonalityMatrixItem.colorToInt;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.UUID;
+
+import dev.amble.lib.register.AmbleRegistries;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.*;
+import net.fabricmc.fabric.api.event.client.player.ClientPreAttackCallback;
+import org.jetbrains.annotations.Nullable;
+
+import net.minecraft.block.DoorBlock;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.HandledScreens;
+import net.minecraft.client.item.ModelPredicateProviderRegistry;
+import net.minecraft.client.particle.EndRodParticle;
+import net.minecraft.client.render.LightmapTextureManager;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
+import net.minecraft.client.render.entity.model.SinglePartEntityModel;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RotationAxis;
+import net.minecraft.util.math.RotationPropertyHelper;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.LightType;
+
 import dev.amble.ait.AITMod;
 import dev.amble.ait.client.boti.*;
 import dev.amble.ait.client.commands.ConfigCommand;
@@ -50,6 +91,8 @@
 import dev.amble.ait.core.entities.BOTIPaintingEntity;
 import dev.amble.ait.core.entities.RiftEntity;
 import dev.amble.ait.core.item.*;
+import dev.amble.ait.core.roundels.RoundelPatterns;
+import dev.amble.ait.core.screens.RoundelFabricatorScreen;
 import dev.amble.ait.core.tardis.Tardis;
 import dev.amble.ait.core.world.TardisServerWorld;
 import dev.amble.ait.data.schema.console.ConsoleTypeSchema;
@@ -61,43 +104,6 @@
 import dev.amble.ait.registry.impl.console.variant.ClientConsoleVariantRegistry;
 import dev.amble.ait.registry.impl.door.ClientDoorRegistry;
 import dev.amble.ait.registry.impl.exterior.ClientExteriorVariantRegistry;
-import dev.amble.lib.register.AmbleRegistries;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
-import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
-import net.fabricmc.fabric.api.client.rendering.v1.*;
-import net.fabricmc.fabric.api.event.client.player.ClientPreAttackCallback;
-import net.minecraft.block.DoorBlock;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.item.ModelPredicateProviderRegistry;
-import net.minecraft.client.particle.EndRodParticle;
-import net.minecraft.client.render.LightmapTextureManager;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
-import net.minecraft.client.render.entity.model.SinglePartEntityModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RotationAxis;
-import net.minecraft.util.math.RotationPropertyHelper;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.LightType;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.UUID;
-
-import static dev.amble.ait.AITMod.*;
-import static dev.amble.ait.core.AITItems.isUnlockedOnThisDay;
-import static dev.amble.ait.core.item.PersonalityMatrixItem.colorToInt;
 
 @Environment(value = EnvType.CLIENT)
 public class AITModClient implements ClientModInitializer {
@@ -113,15 +119,20 @@ public void onInitializeClient() {
         AmbleRegistries.getInstance().registerAll(
                 SonicRegistry.getInstance(),
                 DrinkRegistry.getInstance(),
+                RoundelPatterns.getInstance(),
                 ClientExteriorVariantRegistry.getInstance(),
                 ClientConsoleVariantRegistry.getInstance(),
                 ClientDoorRegistry.getInstance()
         );
 
+        ModelLoadingPlugin.register(new AITModelPlugin());
+
+        //ClientDoorRegistry.init();
         ClientTardisManager.init();
 
         ModuleRegistry.instance().onClientInit();
 
+        registerScreens();
         setupBlockRendering();
         blockEntityRendererRegister();
         entityRenderRegister();
@@ -161,7 +172,6 @@ public void onInitializeClient() {
             WorldRenderEvents.AFTER_ENTITIES.register(this::riftBOTI);
         }
 
-        // @TODO idk why but this gets rid of other important stuff, not sure
         DimensionRenderingRegistry.registerDimensionEffects(AITDimensions.MARS.getValue(), new MarsSkyProperties());
 
         WorldRenderEvents.BEFORE_ENTITIES.register(context -> {
@@ -378,6 +388,8 @@ public static void blockEntityRendererRegister() {
         BlockEntityRendererFactories.register(AITBlockEntityTypes.ENGINE_BLOCK_ENTITY_TYPE, EngineRenderer::new);
         BlockEntityRendererFactories.register(AITBlockEntityTypes.FABRICATOR_BLOCK_ENTITY_TYPE,
                 FabricatorRenderer::new);
+        BlockEntityRendererFactories.register(AITBlockEntityTypes.ROUNDEL_FABRICATOR_BLOCK_ENTITY_TYPE,
+                RoundelFabricatorRenderer::new);
         BlockEntityRendererFactories.register(AITBlockEntityTypes.WAYPOINT_BANK_BLOCK_ENTITY_TYPE,
                 WaypointBankBlockEntityRenderer::new);
         BlockEntityRendererFactories.register(AITBlockEntityTypes.FLAG_BLOCK_ENTITY_TYPE, FlagBlockEntityRenderer::new);
@@ -419,6 +431,7 @@ public static void setupBlockRendering() {
         map.putBlock(AITBlocks.FABRICATOR, RenderLayer.getTranslucent());
         map.putBlock(AITBlocks.ENVIRONMENT_PROJECTOR, RenderLayer.getTranslucent());
         map.putBlock(AITBlocks.WAYPOINT_BANK, RenderLayer.getCutout());
+        map.putBlock(AITBlocks.ROUNDEL, RenderLayer.getCutout());
         if (isUnlockedOnThisDay(Calendar.DECEMBER, 30)) {
             map.putBlock(AITBlocks.SNOW_GLOBE, RenderLayer.getCutout());
         }
@@ -428,6 +441,10 @@ public static void setupBlockRendering() {
         map.putBlock(AITBlocks.MATRIX_ENERGIZER, RenderLayer.getCutout());
     }
 
+    public void registerScreens() {
+        HandledScreens.register(ROUNDEL_FABRICATOR_HANDLER, RoundelFabricatorScreen::new);
+    }
+
     public void registerItemColors() {
         ColorProviderRegistry.ITEM.register((stack, tintIndex) -> {
                     if (tintIndex != 0)

src/main/java/dev/amble/ait/client/AITModelPlugin.java

@@ -0,0 +1,33 @@
+package dev.amble.ait.client;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin;
+import net.fabricmc.fabric.api.client.model.loading.v1.ModelModifier;
+
+import net.minecraft.client.render.model.UnbakedModel;
+import net.minecraft.util.Identifier;
+
+import dev.amble.ait.AITMod;
+import dev.amble.ait.client.models.RoundelModel;
+
+@Environment(EnvType.CLIENT)
+public class AITModelPlugin implements ModelLoadingPlugin, ModelModifier.OnLoad {
+    public static final Identifier ROUNDEL_MODEL = AITMod.id("roundel");
+
+    @Override
+    public void onInitializeModelLoader(ModelLoadingPlugin.Context pluginContext) {
+        pluginContext.modifyModelOnLoad().register(this);
+    }
+
+    @Override
+    public UnbakedModel modifyModelOnLoad(UnbakedModel model, ModelModifier.OnLoad.Context context) {
+        Identifier id = context.id();
+        // This is EXCEPTIONALLY stupid. But so is Mojang. So, in conclusion, fuck you. - Loqor
+        if (id != null && (
+                id.toString().contains("ait:roundel#") && !id.toString().contains("ait:roundel_fabricator"))) {
+            return new RoundelModel();
+        }
+        return model;
+    }
+}

src/main/java/dev/amble/ait/client/boti/TardisDoorBOTI.java

@@ -1,7 +1,6 @@
 package dev.amble.ait.client.boti;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import dev.amble.ait.client.models.AnimatedModel;
 import org.joml.Vector3f;
 import org.lwjgl.opengl.GL11;
 
@@ -17,6 +16,7 @@
 import net.minecraft.util.math.Vec3d;
 
 import dev.amble.ait.client.AITModClient;
+import dev.amble.ait.client.models.AnimatedModel;
 import dev.amble.ait.client.renderers.AITRenderLayers;
 import dev.amble.ait.client.renderers.VortexUtil;
 import dev.amble.ait.client.tardis.ClientTardis;

src/main/java/dev/amble/ait/client/boti/TardisExteriorBOTI.java

@@ -2,7 +2,6 @@
 
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import dev.amble.ait.client.models.exteriors.ExteriorModel;
 import org.joml.Vector3f;
 import org.lwjgl.opengl.GL11;
 
@@ -11,7 +10,6 @@
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.model.SinglePartEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.passive.SheepEntity;
 import net.minecraft.util.DyeColor;
@@ -21,7 +19,7 @@
 
 import dev.amble.ait.api.tardis.TardisComponent;
 import dev.amble.ait.client.AITModClient;
-import dev.amble.ait.client.models.exteriors.SimpleExteriorModel;
+import dev.amble.ait.client.models.exteriors.ExteriorModel;
 import dev.amble.ait.client.renderers.AITRenderLayers;
 import dev.amble.ait.client.tardis.ClientTardis;
 import dev.amble.ait.core.blockentities.ExteriorBlockEntity;

src/main/java/dev/amble/ait/client/models/AnimatedModel.java

@@ -1,22 +1,23 @@
 package dev.amble.ait.client.models;
 
-import dev.amble.ait.client.tardis.ClientTardis;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.util.math.MatrixStack;
 
+import dev.amble.ait.client.tardis.ClientTardis;
+
 public interface AnimatedModel<T extends BlockEntity> {
-	void renderWithAnimations(ClientTardis tardis, T linkableBlockEntity, ModelPart root, MatrixStack matrices,
-	                          VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float pAlpha, float tickDelta);
+    void renderWithAnimations(ClientTardis tardis, T linkableBlockEntity, ModelPart root, MatrixStack matrices,
+                              VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float pAlpha, float tickDelta);
 
-	default void render(MatrixStack stack, VertexConsumer buffer, int maxLightCoordinate, int defaultUv, float base, float base1, float base2, float v) {
-		ModelPart root = getPart();
-		root.render(stack, buffer, maxLightCoordinate, defaultUv, base, base1, base2, v);
-	}
+    default void render(MatrixStack stack, VertexConsumer buffer, int maxLightCoordinate, int defaultUv, float base, float base1, float base2, float v) {
+        ModelPart root = getPart();
+        root.render(stack, buffer, maxLightCoordinate, defaultUv, base, base1, base2, v);
+    }
 
-	/**
-	 * @return the root model part
-	 */
-	ModelPart getPart();
+    /**
+     * @return the root model part
+     */
+    ModelPart getPart();
 }