Skip to content

Commit 64bdcbb

Browse files
average-breadaverage-bread
committed
10.0
1 parent 83e202b commit 64bdcbb

16 files changed

Lines changed: 706 additions & 63 deletions

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ dependencies {
8989
modRuntimeOnly "objects:client:43db9b498cb67058d2e12d394e6507722e71bb45" // https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar
9090
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
9191

92-
// Helper library
93-
// If you do not need Halplibe you can comment this line out or delete this line
9492
modImplementation("turniplabs:halplibe:${project.halplibe_version}")
95-
9693
modImplementation("turniplabs:modmenu-bta:${project.mod_menu_version}")
9794

95+
modImplementation ("useless:moonsteel:1.1.0-7.3_03")
96+
implementation "useless:btwaila:1.2.1-7.3_01"
97+
9898
implementation "org.slf4j:slf4j-api:1.8.0-beta4"
9999
implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0"
100100

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ halplibe_version=5.2.4
1414
#terrain_api_version=1.4.4-7.1
1515

1616
# Mod
17-
mod_version=9.2
17+
mod_version=10.0
1818
mod_group=cursedbread
1919
mod_name=morefeatures

‎src/main/java/cursedbread/morefeatures/FeatureModel.java‎

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,68 @@ public void initBlockModels(BlockModelDispatcher dispatcher) {
311311
() -> new BlockModelColoredWorkbench<>(FeaturesBlocks.vanilla_Colored_Workbench, false)
312312
);
313313
}
314+
315+
if (FeaturesBlocks.newFlowersEnabled == 1){
316+
ModelHelper.setBlockModel(
317+
FeaturesBlocks.white_Flower,
318+
() -> new BlockModelFlowerStackable<>(FeaturesBlocks.white_Flower,
319+
"morefeatures:block/flower_white/")
320+
);
321+
322+
ModelHelper.setBlockModel(
323+
FeaturesBlocks.magenta_Flower,
324+
() -> new BlockModelFlowerStackable<>(FeaturesBlocks.magenta_Flower,
325+
"morefeatures:block/flower_magenta/")
326+
);
327+
328+
ModelHelper.setBlockModel(
329+
FeaturesBlocks.lime_Flower,
330+
() -> new BlockModelFlowerStackable<>(FeaturesBlocks.lime_Flower,
331+
"morefeatures:block/flower_lime/")
332+
);
333+
334+
ModelHelper.setBlockModel(
335+
FeaturesBlocks.gray_Flower,
336+
() -> new BlockModelFlowerStackable<>(FeaturesBlocks.gray_Flower,
337+
"morefeatures:block/flower_gray/")
338+
);
339+
340+
ModelHelper.setBlockModel(
341+
FeaturesBlocks.silver_Flower,
342+
() -> new BlockModelFlowerStackable<>(FeaturesBlocks.silver_Flower,
343+
"morefeatures:block/flower_silver/")
344+
);
345+
346+
ModelHelper.setBlockModel(
347+
FeaturesBlocks.cyan_Flower,
348+
() -> new BlockModelFlowerStackable<>(FeaturesBlocks.cyan_Flower,
349+
"morefeatures:block/flower_cyan/")
350+
);
351+
352+
ModelHelper.setBlockModel(
353+
FeaturesBlocks.blue_Flower,
354+
() -> new BlockModelFlowerStackable<>(FeaturesBlocks.blue_Flower,
355+
"morefeatures:block/flower_blue/")
356+
);
357+
358+
ModelHelper.setBlockModel(
359+
FeaturesBlocks.brown_Flower,
360+
() -> new BlockModelFlowerStackable<>(FeaturesBlocks.brown_Flower,
361+
"morefeatures:block/flower_brown/")
362+
);
363+
364+
ModelHelper.setBlockModel(
365+
FeaturesBlocks.green_Flower,
366+
() -> new BlockModelFlowerStackable<>(FeaturesBlocks.green_Flower,
367+
"morefeatures:block/flower_green/")
368+
);
369+
370+
ModelHelper.setBlockModel(
371+
FeaturesBlocks.black_Flower,
372+
() -> new BlockModelFlowerStackable<>(FeaturesBlocks.black_Flower,
373+
"morefeatures:block/flower_black/")
374+
);
375+
}
314376
}
315377

316378
@Override
@@ -371,6 +433,78 @@ public void initItemModels(ItemModelDispatcher dispatcher) {
371433
model.icon = TextureRegistry.getTexture(FeaturesItems.marigold_Crown.namespaceID);
372434
return model;
373435
});
436+
437+
if (FeaturesBlocks.newFlowersEnabled == 1){
438+
ModelHelper.setItemModel(FeaturesItems.daisy_Crown,
439+
() -> {
440+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.daisy_Crown, MOD_ID);
441+
model.icon = TextureRegistry.getTexture(FeaturesItems.daisy_Crown.namespaceID);
442+
return model;
443+
});
444+
445+
ModelHelper.setItemModel(FeaturesItems.delphiniums_Crown,
446+
() -> {
447+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.delphiniums_Crown, MOD_ID);
448+
model.icon = TextureRegistry.getTexture(FeaturesItems.delphiniums_Crown.namespaceID);
449+
return model;
450+
});
451+
452+
ModelHelper.setItemModel(FeaturesItems.angelica_Crown,
453+
() -> {
454+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.angelica_Crown, MOD_ID);
455+
model.icon = TextureRegistry.getTexture(FeaturesItems.angelica_Crown.namespaceID);
456+
return model;
457+
});
458+
459+
ModelHelper.setItemModel(FeaturesItems.allium_Crown,
460+
() -> {
461+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.allium_Crown, MOD_ID);
462+
model.icon = TextureRegistry.getTexture(FeaturesItems.allium_Crown.namespaceID);
463+
return model;
464+
});
465+
466+
ModelHelper.setItemModel(FeaturesItems.dustymiller_Crown,
467+
() -> {
468+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.dustymiller_Crown, MOD_ID);
469+
model.icon = TextureRegistry.getTexture(FeaturesItems.dustymiller_Crown.namespaceID);
470+
return model;
471+
});
472+
473+
ModelHelper.setItemModel(FeaturesItems.cyanrose_Crown,
474+
() -> {
475+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.cyanrose_Crown, MOD_ID);
476+
model.icon = TextureRegistry.getTexture(FeaturesItems.cyanrose_Crown.namespaceID);
477+
return model;
478+
});
479+
480+
ModelHelper.setItemModel(FeaturesItems.bluepoppy_Crown,
481+
() -> {
482+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.bluepoppy_Crown, MOD_ID);
483+
model.icon = TextureRegistry.getTexture(FeaturesItems.bluepoppy_Crown.namespaceID);
484+
return model;
485+
});
486+
487+
ModelHelper.setItemModel(FeaturesItems.dahlia_Crown,
488+
() -> {
489+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.dahlia_Crown, MOD_ID);
490+
model.icon = TextureRegistry.getTexture(FeaturesItems.dahlia_Crown.namespaceID);
491+
return model;
492+
});
493+
494+
ModelHelper.setItemModel(FeaturesItems.barrelcactus_Crown,
495+
() -> {
496+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.barrelcactus_Crown, MOD_ID);
497+
model.icon = TextureRegistry.getTexture(FeaturesItems.barrelcactus_Crown.namespaceID);
498+
return model;
499+
});
500+
501+
ModelHelper.setItemModel(FeaturesItems.blacktulip_Crown,
502+
() -> {
503+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.blacktulip_Crown, MOD_ID);
504+
model.icon = TextureRegistry.getTexture(FeaturesItems.blacktulip_Crown.namespaceID);
505+
return model;
506+
});
507+
}
374508
}
375509

376510
if (FeaturesItems.normalCrownsEnabled == 1){
@@ -785,6 +919,50 @@ public void initItemModels(ItemModelDispatcher dispatcher) {
785919
return model;
786920
});
787921
}
922+
923+
if (FeaturesItems.glassSwordEnabled == 1){
924+
ModelHelper.setItemModel(FeaturesItems.glass_Sword,
925+
() -> {
926+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.glass_Sword, MOD_ID).setFull3D();
927+
model.icon = TextureRegistry.getTexture(FeaturesItems.glass_Sword.namespaceID);
928+
return model;
929+
});
930+
}
931+
932+
if (FeaturesMain.moonmoonmoonOn){
933+
if (FeaturesItems.normalCrownsEnabled == 1){
934+
ModelHelper.setItemModel(FeaturesItems.moonsteel_Crown,
935+
() -> {
936+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.moonsteel_Crown, MOD_ID);
937+
model.icon = TextureRegistry.getTexture(FeaturesItems.moonsteel_Crown.namespaceID);
938+
return model;
939+
});
940+
}
941+
if (FeaturesItems.paxelsEnabled == 1){
942+
ModelHelper.setItemModel(FeaturesItems.paxel_Moonsteel,
943+
() -> {
944+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.paxel_Moonsteel, MOD_ID).setFull3D();
945+
model.icon = TextureRegistry.getTexture(FeaturesItems.paxel_Moonsteel.namespaceID);
946+
return model;
947+
});
948+
}
949+
if (FeaturesItems.climbPickaxesEnabled == 1){
950+
ModelHelper.setItemModel(FeaturesItems.climb_pickaxe_Monnsteel,
951+
() -> {
952+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.climb_pickaxe_Monnsteel, MOD_ID).setFull3D();
953+
model.icon = TextureRegistry.getTexture(FeaturesItems.climb_pickaxe_Monnsteel.namespaceID);
954+
return model;
955+
});
956+
}
957+
if (FeaturesItems.miningHammersEnabled == 1){
958+
ModelHelper.setItemModel(FeaturesItems.mining_hammer_MoonSteel,
959+
() -> {
960+
ItemModelStandard model = new ItemModelStandard(FeaturesItems.mining_hammer_MoonSteel, MOD_ID).setFull3D();
961+
model.icon = TextureRegistry.getTexture(FeaturesItems.mining_hammer_MoonSteel.namespaceID);
962+
return model;
963+
});
964+
}
965+
}
788966
}
789967

790968
@Override

‎src/main/java/cursedbread/morefeatures/FeaturesCraft.java‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import net.minecraft.core.item.Items;
1515
import turniplabs.halplibe.helper.RecipeBuilder;
1616
import turniplabs.halplibe.util.RecipeEntrypoint;
17+
import useless.moonsteel.MoonSteelBlocks;
18+
import useless.moonsteel.MoonSteelItems;
1719

1820

1921
public class FeaturesCraft implements RecipeEntrypoint {
@@ -32,6 +34,19 @@ public class FeaturesCraft implements RecipeEntrypoint {
3234
Blocks.FLOWER_ORANGE.id()
3335
};
3436

37+
public static int[] flowerMaterial2 = {
38+
FeaturesBlocks.white_Flower.id(),
39+
FeaturesBlocks.magenta_Flower.id(),
40+
FeaturesBlocks.lime_Flower.id(),
41+
FeaturesBlocks.gray_Flower.id(),
42+
FeaturesBlocks.silver_Flower.id(),
43+
FeaturesBlocks.cyan_Flower.id(),
44+
FeaturesBlocks.blue_Flower.id(),
45+
FeaturesBlocks.brown_Flower.id(),
46+
FeaturesBlocks.green_Flower.id(),
47+
FeaturesBlocks.black_Flower.id()
48+
};
49+
3550
public static Item[] flowercrownResult = {
3651
FeaturesItems.dandelion_Crown,
3752
FeaturesItems.rose_Crown,
@@ -43,6 +58,19 @@ public class FeaturesCraft implements RecipeEntrypoint {
4358
FeaturesItems.marigold_Crown
4459
};
4560

61+
public static Item[] flowercrownResult2 = {
62+
FeaturesItems.daisy_Crown,
63+
FeaturesItems.delphiniums_Crown,
64+
FeaturesItems.angelica_Crown,
65+
FeaturesItems.allium_Crown,
66+
FeaturesItems.dustymiller_Crown,
67+
FeaturesItems.cyanrose_Crown,
68+
FeaturesItems.bluepoppy_Crown,
69+
FeaturesItems.dahlia_Crown,
70+
FeaturesItems.barrelcactus_Crown,
71+
FeaturesItems.blacktulip_Crown
72+
};
73+
4674
public static int[] regularMaterial = {
4775
Items.LEATHER.id,
4876
Items.INGOT_IRON.id,
@@ -504,6 +532,16 @@ public void onRecipesReady() {
504532
.addInput('H', material)
505533
.create("rown", new ItemStack(flowercrownResult[j], 1));
506534
}
535+
536+
if (FeaturesBlocks.newFlowersEnabled == 1){
537+
for (int j = 0; j < flowerMaterial2.length; j++) {
538+
Item material = Item.itemsList[flowerMaterial2[j]];
539+
RecipeBuilder.Shaped(MOD_ID)
540+
.setShape("HHH", "H H", "HHH")
541+
.addInput('H', material)
542+
.create("rown", new ItemStack(flowercrownResult2[j], 1));
543+
}
544+
}
507545
}
508546
//regular crown crafting
509547
if (FeaturesItems.normalCrownsEnabled == 1) {
@@ -823,5 +861,86 @@ public void onRecipesReady() {
823861
workbenchGroup.register("ladderdyeing", new RecipeEntryDyeing(new RecipeSymbol("morefeatures:ladders") , new ItemStack(FeaturesBlocks.vanilla_Colored_Ladder), true, false));
824862
workbenchGroup.register("ladderundyeing", new RecipeEntryUndyeing(new RecipeSymbol("morefeatures:ladders") , new ItemStack(Blocks.LADDER_OAK)));
825863
}
864+
865+
if (FeaturesItems.glassSwordEnabled == 1){
866+
RecipeBuilder.Shaped(MOD_ID)
867+
.setShape("G", "G", "S")
868+
.addInput('S', Items.STICK)
869+
.addInput('G', Blocks.GLASS)
870+
.create("glasssword", new ItemStack(FeaturesItems.glass_Sword));
871+
}
872+
873+
if (FeaturesMain.moonmoonmoonOn){
874+
RecipeBuilder.Shaped(MOD_ID)
875+
.setShape("APH", " W ", " S ")
876+
.addInput('S', Items.STICK)
877+
.addInput('A', MoonSteelItems.TOOL_AXE_MOONSTEEL)
878+
.addInput('P', MoonSteelItems.TOOL_PICKAXE_MOONSTEEL)
879+
.addInput('H', MoonSteelItems.TOOL_SHOVEL_MOONSTEEL)
880+
.addInput('W', MoonSteelItems.TOOL_SWORD_MOONSTEEL)
881+
.create("paxelcraft", new ItemStack(FeaturesItems.paxel_Moonsteel));
882+
883+
RecipeBuilder.Shaped(MOD_ID)
884+
.setShape("MM ", "MSH", " S ")
885+
.addInput('S', Items.STICK)
886+
.addInput('M', MoonSteelItems.INGOT_MOONSTEEL)
887+
.addInput('H', MoonSteelBlocks.BLOCK_MOONSTEEL)
888+
.create("climbpickcraft", new ItemStack(FeaturesItems.climb_pickaxe_Monnsteel));
889+
890+
RecipeBuilder.Shaped(MOD_ID)
891+
.setShape("HMH", "MSM", " S ")
892+
.addInput('S', Items.STICK)
893+
.addInput('M', MoonSteelItems.INGOT_MOONSTEEL)
894+
.addInput('H', MoonSteelBlocks.BLOCK_MOONSTEEL)
895+
.create("hammercraft", new ItemStack(FeaturesItems.mining_hammer_MoonSteel));
896+
897+
RecipeBuilder.Shaped(MOD_ID)
898+
.setShape("HCH", "HHH")
899+
.addInput('H', MoonSteelItems.INGOT_MOONSTEEL)
900+
.addInput('C', Items.CLOTH)
901+
.create("crown", new ItemStack(FeaturesItems.moonsteel_Crown, 1));
902+
}
903+
904+
if (FeaturesBlocks.newFlowersEnabled == 1){
905+
RecipeBuilder.Shapeless(MOD_ID)
906+
.addInput(FeaturesBlocks.white_Flower)
907+
.create("whiteflowertodye", new ItemStack(Items.DYE, 2, 15));
908+
909+
RecipeBuilder.Shapeless(MOD_ID)
910+
.addInput(FeaturesBlocks.magenta_Flower)
911+
.create("magentaflowertodye", new ItemStack(Items.DYE, 2, 13));
912+
913+
RecipeBuilder.Shapeless(MOD_ID)
914+
.addInput(FeaturesBlocks.lime_Flower)
915+
.create("limeflowertodye", new ItemStack(Items.DYE, 2, 10));
916+
917+
RecipeBuilder.Shapeless(MOD_ID)
918+
.addInput(FeaturesBlocks.gray_Flower)
919+
.create("grayflowertodye", new ItemStack(Items.DYE, 2, 8));
920+
921+
RecipeBuilder.Shapeless(MOD_ID)
922+
.addInput(FeaturesBlocks.silver_Flower)
923+
.create("silverflowertodye", new ItemStack(Items.DYE, 2, 7));
924+
925+
RecipeBuilder.Shapeless(MOD_ID)
926+
.addInput(FeaturesBlocks.cyan_Flower)
927+
.create("cyanflowertodye", new ItemStack(Items.DYE, 2, 6));
928+
929+
RecipeBuilder.Shapeless(MOD_ID)
930+
.addInput(FeaturesBlocks.blue_Flower)
931+
.create("blueflowertodye", new ItemStack(Items.DYE, 2, 4));
932+
933+
RecipeBuilder.Shapeless(MOD_ID)
934+
.addInput(FeaturesBlocks.brown_Flower)
935+
.create("brownflowertodye", new ItemStack(Items.DYE, 2, 3));
936+
937+
RecipeBuilder.Shapeless(MOD_ID)
938+
.addInput(FeaturesBlocks.green_Flower)
939+
.create("greenflowertodye", new ItemStack(Items.DYE, 2, 2));
940+
941+
RecipeBuilder.Shapeless(MOD_ID)
942+
.addInput(FeaturesBlocks.black_Flower)
943+
.create("blackflowertodye", new ItemStack(Items.DYE, 2, 0));
944+
}
826945
}
827946
}

0 commit comments

Comments
 (0)