From 7f049e099d19ffcc270b27fca51180d03dca2253 Mon Sep 17 00:00:00 2001
From: Sebastian Hartte <sebastian@hartte.de>
Date: Sun, 28 Jun 2020 00:48:21 +0200
Subject: [PATCH] Moving code around

---
 .../main/java/appeng/bootstrap/BlockDefinitionBuilder.java    | 0
 .../src}/main/java/appeng/bootstrap/BlockEntityBuilder.java   | 0
 .../src}/main/java/appeng/bootstrap/BlockRendering.java       | 0
 .../main/java/appeng/bootstrap/BlockRenderingCustomizer.java  | 0
 .../src}/main/java/appeng/bootstrap/EntityBuilder.java        | 0
 .../src}/main/java/appeng/bootstrap/FeatureFactory.java       | 0
 .../src}/main/java/appeng/bootstrap/IBlockBuilder.java        | 0
 .../src}/main/java/appeng/bootstrap/IBlockRendering.java      | 0
 .../src}/main/java/appeng/bootstrap/IBootstrapComponent.java  | 0
 .../main/java/appeng/bootstrap/ICriterionTriggerRegistry.java | 0
 .../src}/main/java/appeng/bootstrap/IItemBuilder.java         | 0
 .../src}/main/java/appeng/bootstrap/IItemRendering.java       | 0
 .../main/java/appeng/bootstrap/ItemDefinitionBuilder.java     | 0
 .../src}/main/java/appeng/bootstrap/ItemRendering.java        | 0
 .../main/java/appeng/bootstrap/ItemRenderingCustomizer.java   | 0
 .../src}/main/java/appeng/bootstrap/ModelsReloadCallback.java | 0
 .../src}/main/java/appeng/bootstrap/TileEntityRendering.java  | 0
 .../java/appeng/bootstrap/TileEntityRenderingCustomizer.java  | 0
 .../java/appeng/bootstrap/components/BlockColorComponent.java | 0
 .../appeng/bootstrap/components/IClientSetupComponent.java    | 0
 .../main/java/appeng/bootstrap/components/IInitComponent.java | 0
 .../bootstrap/components/IItemColorRegistrationComponent.java | 0
 .../java/appeng/bootstrap/components/IModelBakeComponent.java | 0
 .../java/appeng/bootstrap/components/IPostInitComponent.java  | 0
 .../components/ITileEntityRegistrationComponent.java          | 0
 .../java/appeng/bootstrap/components/ItemColorComponent.java  | 0
 .../appeng/bootstrap/components/ModelOverrideComponent.java   | 0
 .../java/appeng/bootstrap/components/RenderTypeComponent.java | 0
 .../appeng/bootstrap/definitions/TileEntityDefinition.java    | 0
 core/src/main/java/appeng/mixins/ModelsReloadMixin.java       | 4 ++--
 30 files changed, 2 insertions(+), 2 deletions(-)
 rename {src => core/src}/main/java/appeng/bootstrap/BlockDefinitionBuilder.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/BlockEntityBuilder.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/BlockRendering.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/BlockRenderingCustomizer.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/EntityBuilder.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/FeatureFactory.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/IBlockBuilder.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/IBlockRendering.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/IBootstrapComponent.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/ICriterionTriggerRegistry.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/IItemBuilder.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/IItemRendering.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/ItemDefinitionBuilder.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/ItemRendering.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/ItemRenderingCustomizer.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/ModelsReloadCallback.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/TileEntityRendering.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/components/BlockColorComponent.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/components/IClientSetupComponent.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/components/IInitComponent.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/components/IModelBakeComponent.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/components/IPostInitComponent.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/components/ItemColorComponent.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/components/ModelOverrideComponent.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/components/RenderTypeComponent.java (100%)
 rename {src => core/src}/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java (100%)

diff --git a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java b/core/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java
rename to core/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java
diff --git a/src/main/java/appeng/bootstrap/BlockEntityBuilder.java b/core/src/main/java/appeng/bootstrap/BlockEntityBuilder.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/BlockEntityBuilder.java
rename to core/src/main/java/appeng/bootstrap/BlockEntityBuilder.java
diff --git a/src/main/java/appeng/bootstrap/BlockRendering.java b/core/src/main/java/appeng/bootstrap/BlockRendering.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/BlockRendering.java
rename to core/src/main/java/appeng/bootstrap/BlockRendering.java
diff --git a/src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java b/core/src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java
rename to core/src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java
diff --git a/src/main/java/appeng/bootstrap/EntityBuilder.java b/core/src/main/java/appeng/bootstrap/EntityBuilder.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/EntityBuilder.java
rename to core/src/main/java/appeng/bootstrap/EntityBuilder.java
diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/core/src/main/java/appeng/bootstrap/FeatureFactory.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/FeatureFactory.java
rename to core/src/main/java/appeng/bootstrap/FeatureFactory.java
diff --git a/src/main/java/appeng/bootstrap/IBlockBuilder.java b/core/src/main/java/appeng/bootstrap/IBlockBuilder.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/IBlockBuilder.java
rename to core/src/main/java/appeng/bootstrap/IBlockBuilder.java
diff --git a/src/main/java/appeng/bootstrap/IBlockRendering.java b/core/src/main/java/appeng/bootstrap/IBlockRendering.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/IBlockRendering.java
rename to core/src/main/java/appeng/bootstrap/IBlockRendering.java
diff --git a/src/main/java/appeng/bootstrap/IBootstrapComponent.java b/core/src/main/java/appeng/bootstrap/IBootstrapComponent.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/IBootstrapComponent.java
rename to core/src/main/java/appeng/bootstrap/IBootstrapComponent.java
diff --git a/src/main/java/appeng/bootstrap/ICriterionTriggerRegistry.java b/core/src/main/java/appeng/bootstrap/ICriterionTriggerRegistry.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/ICriterionTriggerRegistry.java
rename to core/src/main/java/appeng/bootstrap/ICriterionTriggerRegistry.java
diff --git a/src/main/java/appeng/bootstrap/IItemBuilder.java b/core/src/main/java/appeng/bootstrap/IItemBuilder.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/IItemBuilder.java
rename to core/src/main/java/appeng/bootstrap/IItemBuilder.java
diff --git a/src/main/java/appeng/bootstrap/IItemRendering.java b/core/src/main/java/appeng/bootstrap/IItemRendering.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/IItemRendering.java
rename to core/src/main/java/appeng/bootstrap/IItemRendering.java
diff --git a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java b/core/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java
rename to core/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java
diff --git a/src/main/java/appeng/bootstrap/ItemRendering.java b/core/src/main/java/appeng/bootstrap/ItemRendering.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/ItemRendering.java
rename to core/src/main/java/appeng/bootstrap/ItemRendering.java
diff --git a/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java b/core/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java
rename to core/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java
diff --git a/src/main/java/appeng/bootstrap/ModelsReloadCallback.java b/core/src/main/java/appeng/bootstrap/ModelsReloadCallback.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/ModelsReloadCallback.java
rename to core/src/main/java/appeng/bootstrap/ModelsReloadCallback.java
diff --git a/src/main/java/appeng/bootstrap/TileEntityRendering.java b/core/src/main/java/appeng/bootstrap/TileEntityRendering.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/TileEntityRendering.java
rename to core/src/main/java/appeng/bootstrap/TileEntityRendering.java
diff --git a/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java b/core/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java
rename to core/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java
diff --git a/src/main/java/appeng/bootstrap/components/BlockColorComponent.java b/core/src/main/java/appeng/bootstrap/components/BlockColorComponent.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/components/BlockColorComponent.java
rename to core/src/main/java/appeng/bootstrap/components/BlockColorComponent.java
diff --git a/src/main/java/appeng/bootstrap/components/IClientSetupComponent.java b/core/src/main/java/appeng/bootstrap/components/IClientSetupComponent.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/components/IClientSetupComponent.java
rename to core/src/main/java/appeng/bootstrap/components/IClientSetupComponent.java
diff --git a/src/main/java/appeng/bootstrap/components/IInitComponent.java b/core/src/main/java/appeng/bootstrap/components/IInitComponent.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/components/IInitComponent.java
rename to core/src/main/java/appeng/bootstrap/components/IInitComponent.java
diff --git a/src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java b/core/src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java
rename to core/src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java
diff --git a/src/main/java/appeng/bootstrap/components/IModelBakeComponent.java b/core/src/main/java/appeng/bootstrap/components/IModelBakeComponent.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/components/IModelBakeComponent.java
rename to core/src/main/java/appeng/bootstrap/components/IModelBakeComponent.java
diff --git a/src/main/java/appeng/bootstrap/components/IPostInitComponent.java b/core/src/main/java/appeng/bootstrap/components/IPostInitComponent.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/components/IPostInitComponent.java
rename to core/src/main/java/appeng/bootstrap/components/IPostInitComponent.java
diff --git a/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java b/core/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java
rename to core/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java
diff --git a/src/main/java/appeng/bootstrap/components/ItemColorComponent.java b/core/src/main/java/appeng/bootstrap/components/ItemColorComponent.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/components/ItemColorComponent.java
rename to core/src/main/java/appeng/bootstrap/components/ItemColorComponent.java
diff --git a/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java b/core/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java
rename to core/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java
diff --git a/src/main/java/appeng/bootstrap/components/RenderTypeComponent.java b/core/src/main/java/appeng/bootstrap/components/RenderTypeComponent.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/components/RenderTypeComponent.java
rename to core/src/main/java/appeng/bootstrap/components/RenderTypeComponent.java
diff --git a/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java b/core/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java
similarity index 100%
rename from src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java
rename to core/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java
diff --git a/core/src/main/java/appeng/mixins/ModelsReloadMixin.java b/core/src/main/java/appeng/mixins/ModelsReloadMixin.java
index 1c604a9ae..f1321c515 100644
--- a/core/src/main/java/appeng/mixins/ModelsReloadMixin.java
+++ b/core/src/main/java/appeng/mixins/ModelsReloadMixin.java
@@ -1,5 +1,6 @@
 package appeng.mixins;
 
+import appeng.bootstrap.ModelsReloadCallback;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.util.Identifier;
@@ -15,8 +16,7 @@ public class ModelsReloadMixin {
 
     @Inject(method = "getBakedModelMap", at = @At("RETURN"))
     public void onGetBakedModelMap(CallbackInfoReturnable<Map<Identifier, BakedModel>> ci) {
-        Map<Identifier, BakedModel> models = ci.getReturnValue();
-
+        ModelsReloadCallback.EVENT.invoker().onModelsReloaded(ci.getReturnValue());
     }
 
 }