From 2db289203320a211be830a931eed34abe7626cbe Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sat, 23 Oct 2021 03:50:49 +0200 Subject: [PATCH] Not client enough - bump version - actually fix ISTER dist issue --- gradle.properties | 2 +- src/main/java/com/simibubi/create/Create.java | 2 +- .../foundation/data/CreateRegistrate.java | 50 +++++++++++-------- src/main/resources/META-INF/mods.toml | 2 +- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/gradle.properties b/gradle.properties index e77ab6368..861b6fc61 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs = -Xmx3G org.gradle.daemon = false # mod version info -mod_version = 0.3.2e +mod_version = 0.3.2f minecraft_version = 1.16.5 forge_version = 36.2.0 diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index 24393754d..cf6320f66 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -60,7 +60,7 @@ public class Create { public static final String ID = "create"; public static final String NAME = "Create"; - public static final String VERSION = "0.3.2e"; + public static final String VERSION = "0.3.2f"; public static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java index f5427fb4a..67f1e08fb 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java @@ -130,11 +130,13 @@ public class CreateRegistrate extends AbstractRegistrate { } @Override - public CreateEntityBuilder entity(String name, EntityType.IFactory factory, EntityClassification classification) { + public CreateEntityBuilder entity(String name, + EntityType.IFactory factory, EntityClassification classification) { return this.entity(self(), name, factory, classification); } - public CreateEntityBuilder entity(P parent, String name, EntityType.IFactory factory, EntityClassification classification) { + public CreateEntityBuilder entity(P parent, String name, EntityType.IFactory factory, + EntityClassification classification) { return (CreateEntityBuilder) this.entry(name, (callback) -> { return CreateEntityBuilder.create(this, parent, name, callback, factory, classification); }); @@ -160,8 +162,8 @@ public class CreateRegistrate extends AbstractRegistrate { return builder; } - public BlockBuilder paletteStoneBlock(String name, - NonNullSupplier propertiesFrom, boolean worldGenStone) { + public BlockBuilder paletteStoneBlock(String name, NonNullSupplier propertiesFrom, + boolean worldGenStone) { return paletteStoneBlock(name, Block::new, propertiesFrom, worldGenStone); } @@ -198,7 +200,7 @@ public class CreateRegistrate extends AbstractRegistrate { } public static NonNullConsumer casingConnectivity( - BiConsumer consumer) { + BiConsumer consumer) { return entry -> onClient(() -> () -> registerCasingConnectivity(entry, consumer)); } @@ -207,20 +209,21 @@ public class CreateRegistrate extends AbstractRegistrate { } public static NonNullConsumer blockModel( - Supplier> func) { + Supplier> func) { return entry -> onClient(() -> () -> registerBlockModel(entry, func)); } public static NonNullConsumer itemModel( - Supplier> func) { + Supplier> func) { return entry -> onClient(() -> () -> registerItemModel(entry, func)); } public static NonNullUnaryOperator> customRenderedItem( Supplier>> supplier) { - return b -> b.properties(p -> p.setISTER(() -> () -> supplier.get() - .get())) - .onRegister(entry -> onClient(() -> () -> registerCustomRenderedItem(entry))); + return b -> { + onClient(() -> () -> customRenderedItem(b, supplier)); + return b; + }; } protected static void onClient(Supplier toRun) { @@ -228,35 +231,39 @@ public class CreateRegistrate extends AbstractRegistrate { } @OnlyIn(Dist.CLIENT) - private static void registerCustomRenderedItem(Item entry) { - ItemStackTileEntityRenderer ister = entry.getItemStackTileEntityRenderer(); - if (ister instanceof CustomRenderedItemModelRenderer) - registerCustomRenderedItem(entry, (CustomRenderedItemModelRenderer) ister); + private static void customRenderedItem(ItemBuilder b, + Supplier>> supplier) { + b.properties(p -> p.setISTER(() -> supplier.get()::get)) + .onRegister(entry -> { + ItemStackTileEntityRenderer ister = entry.getItemStackTileEntityRenderer(); + if (ister instanceof CustomRenderedItemModelRenderer) + registerCustomRenderedItem(entry, (CustomRenderedItemModelRenderer) ister); + }); } - + @OnlyIn(Dist.CLIENT) private static void registerCTBehviour(Block entry, ConnectedTextureBehaviour behavior) { CreateClient.MODEL_SWAPPER.getCustomBlockModels() - .register(entry.delegate, model -> new CTModel(model, behavior)); + .register(entry.delegate, model -> new CTModel(model, behavior)); } @OnlyIn(Dist.CLIENT) private static void registerCasingConnectivity(T entry, - BiConsumer consumer) { + BiConsumer consumer) { consumer.accept(entry, CreateClient.CASING_CONNECTIVITY); } @OnlyIn(Dist.CLIENT) private static void registerBlockVertexColor(Block entry, IBlockVertexColor colorFunc) { CreateClient.MODEL_SWAPPER.getCustomBlockModels() - .register(entry.delegate, model -> new ColoredVertexModel(model, colorFunc)); + .register(entry.delegate, model -> new ColoredVertexModel(model, colorFunc)); } @OnlyIn(Dist.CLIENT) private static void registerBlockModel(Block entry, - Supplier> func) { + Supplier> func) { CreateClient.MODEL_SWAPPER.getCustomBlockModels() - .register(entry.delegate, func.get()); + .register(entry.delegate, func.get()); } @OnlyIn(Dist.CLIENT) @@ -267,8 +274,7 @@ public class CreateRegistrate extends AbstractRegistrate { } @OnlyIn(Dist.CLIENT) - private static void registerCustomRenderedItem(Item entry, - CustomRenderedItemModelRenderer renderer) { + private static void registerCustomRenderedItem(Item entry, CustomRenderedItemModelRenderer renderer) { CreateClient.MODEL_SWAPPER.getCustomRenderedItems() .register(entry.delegate, renderer::createModel); } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index b2ed3b126..475f03ec4 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -5,7 +5,7 @@ license="MIT" [[mods]] modId="create" -version="v0.3.2e" +version="v0.3.2f" displayName="Create" #updateJSONURL="" displayURL="https://www.curseforge.com/minecraft/mc-mods/create"