mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-12-25 22:46:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix build issues outside IDE (again)

Browse source
This commit is contained in:
simibubi 2020-05-29 00:19:47 +02:00
parent c53f9c2079
commit 9973a853cc
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/simibubi/create/AllItems.java
View file

@ -116,7 +116,7 @@ public class AllItems {
.register(); .register();
public static final ItemEntry<VerticalGearboxItem> VERTICAL_GEARBOX = REGISTRATE.item("vertical_gearbox", VerticalGearboxItem::new) public static final ItemEntry<VerticalGearboxItem> VERTICAL_GEARBOX = REGISTRATE.item("vertical_gearbox", VerticalGearboxItem::new)
.model(AssetLookup.customItemModel("gearbox", "item_vertical")) .model(AssetLookup.<VerticalGearboxItem>customItemModel("gearbox", "item_vertical"))
.register(); .register();
public static final ItemEntry<SuperGlueItem> SUPER_GLUE = REGISTRATE.item("super_glue", SuperGlueItem::new) public static final ItemEntry<SuperGlueItem> SUPER_GLUE = REGISTRATE.item("super_glue", SuperGlueItem::new)

2
src/main/java/com/simibubi/create/foundation/data/AssetLookup.java
View file

@ -46,7 +46,7 @@ public class AssetLookup {
* Generate item model inheriting from a seperate model in * Generate item model inheriting from a seperate model in
* models/block/x/item.json * models/block/x/item.json
*/ */
public static ItemModelBuilder customItemModel(DataGenContext<Item, ? extends BlockItem> ctx, public static <I extends BlockItem> ItemModelBuilder customItemModel(DataGenContext<Item, I> ctx,
RegistrateItemModelProvider prov) { RegistrateItemModelProvider prov) {
return prov.blockItem(() -> ctx.getEntry() return prov.blockItem(() -> ctx.getEntry()
.getBlock(), "/item"); .getBlock(), "/item");

5
src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java
View file

@ -135,8 +135,9 @@ public class CreateRegistrate extends AbstractRegistrate<CreateRegistrate> {
public static <T extends Item, P> NonNullUnaryOperator<ItemBuilder<T, P>> customRenderedItem( public static <T extends Item, P> NonNullUnaryOperator<ItemBuilder<T, P>> customRenderedItem(
Supplier<NonNullFunction<IBakedModel, ? extends CustomRenderedItemModel>> func) { Supplier<NonNullFunction<IBakedModel, ? extends CustomRenderedItemModel>> func) {
return b -> b.properties(p -> p.setISTER(() -> func.get() return b -> b.properties(p -> p.setISTER(() -> () -> func.get()
.apply(null)::createRenderer)) .apply(null)
.createRenderer()))
.onRegister(entry -> onClient(() -> () -> registerCustomRenderedItem(entry, func))); .onRegister(entry -> onClient(() -> () -> registerCustomRenderedItem(entry, func)));
} }