Re-Activated the facade recipe and item model

This commit is contained in:
Sebastian Hartte
2020-06-21 23:35:57 +02:00
parent 00e794f03f
commit 094ee93dbc
11 changed files with 50 additions and 131 deletions
+2
View File
@@ -23,6 +23,7 @@ import java.util.function.Supplier;
import javax.annotation.Nonnull;
import appeng.client.render.FacadeItemModel;
import com.google.common.base.Stopwatch;
import net.minecraft.block.Block;
@@ -213,6 +214,7 @@ public final class AppEng {
addBuiltInModel("paint_splotches", PaintSplotchesModel::new);
addBuiltInModel("quantum_bridge_formed", QnbFormedModel::new);
addBuiltInModel("p2p_tunnel_frequency", P2PTunnelFrequencyModel::new);
addBuiltInModel("facade", FacadeItemModel::new);
ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "encoded_pattern"),
EncodedPatternModelLoader.INSTANCE);
ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "part_plane"),
+8 -2
View File
@@ -18,6 +18,8 @@
package appeng.core;
import appeng.items.parts.ItemFacade;
import appeng.recipes.game.FacadeRecipe;
import net.minecraft.advancements.CriteriaTriggers;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
@@ -425,8 +427,12 @@ final class Registration {
GrinderRecipe.TYPE = new AERecipeType<>(GrinderRecipeSerializer.INSTANCE.getRegistryName());
InscriberRecipe.TYPE = new AERecipeType<>(InscriberRecipeSerializer.INSTANCE.getRegistryName());
r.registerAll(DisassembleRecipe.SERIALIZER, GrinderRecipeSerializer.INSTANCE, InscriberRecipeSerializer.INSTANCE
// FacadeRecipe.getSerializer( (ItemFacade) definitions.items().facade().item() ) FIXME reimplement facades
ItemFacade facadeItem = (ItemFacade) Api.INSTANCE.definitions().items().facade().item();
r.registerAll(
DisassembleRecipe.SERIALIZER,
GrinderRecipeSerializer.INSTANCE,
InscriberRecipeSerializer.INSTANCE,
FacadeRecipe.getSerializer(facadeItem)
);
CraftingHelper.register(FeaturesEnabled.Serializer.INSTANCE);
@@ -31,7 +31,6 @@ import appeng.api.features.AEFeature;
import appeng.api.util.AEColor;
import appeng.api.util.AEColoredItemDefinition;
import appeng.bootstrap.FeatureFactory;
import appeng.core.CreativeTabFacade;
import appeng.core.features.ActivityState;
import appeng.core.features.ColoredItemDefinition;
import appeng.core.features.ItemStackSrc;
@@ -51,7 +50,6 @@ import appeng.items.misc.ItemCrystalSeed;
import appeng.items.misc.ItemEncodedPattern;
import appeng.items.misc.ItemPaintBall;
import appeng.items.misc.ItemPaintBallRendering;
import appeng.items.parts.FacadeRendering;
import appeng.items.parts.ItemFacade;
import appeng.items.storage.BasicItemStorageCell;
import appeng.items.storage.ItemCreativeStorageCell;
@@ -277,8 +275,7 @@ public final class ApiItems implements IItems {
.item("128_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 128))
.props(storageCellProps).build();
this.facade = registry.item("facade", ItemFacade::new).features(AEFeature.FACADES)
.itemGroup(CreativeTabFacade.instance).rendering(new FacadeRendering()).build();
this.facade = registry.item("facade", ItemFacade::new).features(AEFeature.FACADES).build();
this.certusCrystalSeed = registry
.item("certus_crystal_seed",