Skip to content

Commit f72aeba

Browse files
average-breadaverage-bread
committed
12.0
1 parent 6523ab6 commit f72aeba

27 files changed

+589
-116
lines changed

‎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=11.0
17+
mod_version=12.0
1818
mod_group=cursedbread
1919
mod_name=morefeatures

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

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import cursedbread.morefeatures.item.FeaturesItems;
1111
import cursedbread.morefeatures.item.artifacts.ItemModelBombQuiver;
1212
import cursedbread.morefeatures.item.other.ItemModelFertilizerBag;
13+
import cursedbread.morefeatures.item.models.ItemModelBig;
1314
import net.fabricmc.api.EnvType;
1415
import net.fabricmc.api.Environment;
1516
import net.minecraft.client.render.EntityRenderDispatcher;
@@ -23,8 +24,6 @@
2324
import turniplabs.halplibe.helper.ModelHelper;
2425
import turniplabs.halplibe.util.ModelEntrypoint;
2526

26-
import static cursedbread.morefeatures.FeaturesMain.MOD_ID;
27-
2827
@Environment(EnvType.CLIENT)
2928
public class FeatureModel implements ModelEntrypoint {
3029
@Override
@@ -374,6 +373,14 @@ public void initBlockModels(BlockModelDispatcher dispatcher) {
374373
);
375374
}
376375

376+
if (FeaturesBlocks.woodMeshEnabled == 1) {
377+
ModelHelper.setBlockModel(
378+
FeaturesBlocks.wood_Mesh,
379+
() -> new BlockModelTransparent<>(FeaturesBlocks.wood_Mesh, true)
380+
.setTex(0,"morefeatures:block/mesh_wood", Side.sides)
381+
);
382+
}
383+
377384
if (FeaturesMain.deepOn){
378385
if (FeaturesBlocks.superoresEnabled == 1){
379386
ModelHelper.setBlockModel(
@@ -1071,6 +1078,45 @@ public void initItemModels(ItemModelDispatcher dispatcher) {
10711078
});
10721079
}
10731080

1081+
if (FeaturesItems.scytheEnabled == 1){
1082+
ModelHelper.setItemModel(FeaturesItems.scythe_Wood,
1083+
() -> {
1084+
ItemModelStandard model = new ItemModelBig(FeaturesItems.scythe_Wood, null).setFull3D();
1085+
model.icon = TextureRegistry.getTexture(FeaturesItems.scythe_Wood.namespaceID);
1086+
return model;
1087+
});
1088+
ModelHelper.setItemModel(FeaturesItems.scythe_Stone,
1089+
() -> {
1090+
ItemModelStandard model = new ItemModelBig(FeaturesItems.scythe_Stone, null).setFull3D();
1091+
model.icon = TextureRegistry.getTexture(FeaturesItems.scythe_Stone.namespaceID);
1092+
return model;
1093+
});ModelHelper.setItemModel(FeaturesItems.scythe_Iron,
1094+
() -> {
1095+
ItemModelStandard model = new ItemModelBig(FeaturesItems.scythe_Iron, null).setFull3D();
1096+
model.icon = TextureRegistry.getTexture(FeaturesItems.scythe_Iron.namespaceID);
1097+
return model;
1098+
});
1099+
ModelHelper.setItemModel(FeaturesItems.scythe_Gold,
1100+
() -> {
1101+
ItemModelStandard model = new ItemModelBig(FeaturesItems.scythe_Gold, null).setFull3D();
1102+
model.icon = TextureRegistry.getTexture(FeaturesItems.scythe_Gold.namespaceID);
1103+
return model;
1104+
});
1105+
ModelHelper.setItemModel(FeaturesItems.scythe_Diamond,
1106+
() -> {
1107+
ItemModelStandard model = new ItemModelBig(FeaturesItems.scythe_Diamond, null).setFull3D();
1108+
model.icon = TextureRegistry.getTexture(FeaturesItems.scythe_Diamond.namespaceID);
1109+
return model;
1110+
});
1111+
ModelHelper.setItemModel(FeaturesItems.scythe_Steel,
1112+
() -> {
1113+
ItemModelStandard model = new ItemModelBig(FeaturesItems.scythe_Steel, null).setFull3D();
1114+
model.icon = TextureRegistry.getTexture(FeaturesItems.scythe_Steel.namespaceID);
1115+
return model;
1116+
});
1117+
1118+
}
1119+
10741120
if (FeaturesMain.moonmoonmoonOn){
10751121
if (FeaturesItems.normalCrownsEnabled == 1){
10761122
ModelHelper.setItemModel(FeaturesItems.moonsteel_Crown,
@@ -1104,6 +1150,14 @@ public void initItemModels(ItemModelDispatcher dispatcher) {
11041150
return model;
11051151
});
11061152
}
1153+
if (FeaturesItems.scytheEnabled == 1){
1154+
ModelHelper.setItemModel(FeaturesItems.scythe_MoonSteel,
1155+
() -> {
1156+
ItemModelStandard model = new ItemModelBig(FeaturesItems.scythe_MoonSteel, null).setFull3D();
1157+
model.icon = TextureRegistry.getTexture(FeaturesItems.scythe_MoonSteel.namespaceID);
1158+
return model;
1159+
});
1160+
}
11071161
}
11081162

11091163
if (FeaturesMain.deepOn){
@@ -1181,6 +1235,26 @@ public void initItemModels(ItemModelDispatcher dispatcher) {
11811235
return model;
11821236
});
11831237
}
1238+
if (FeaturesItems.scytheEnabled == 1){
1239+
ModelHelper.setItemModel(FeaturesItems.scythe_Amethyst,
1240+
() -> {
1241+
ItemModelStandard model = new ItemModelBig(FeaturesItems.scythe_Amethyst, null).setFull3D();
1242+
model.icon = TextureRegistry.getTexture(FeaturesItems.scythe_Amethyst.namespaceID);
1243+
return model;
1244+
});
1245+
ModelHelper.setItemModel(FeaturesItems.scythe_Lead,
1246+
() -> {
1247+
ItemModelStandard model = new ItemModelBig(FeaturesItems.scythe_Lead, null).setFull3D();
1248+
model.icon = TextureRegistry.getTexture(FeaturesItems.scythe_Lead.namespaceID);
1249+
return model;
1250+
});
1251+
ModelHelper.setItemModel(FeaturesItems.scythe_Silver,
1252+
() -> {
1253+
ItemModelStandard model = new ItemModelBig(FeaturesItems.scythe_Silver, null).setFull3D();
1254+
model.icon = TextureRegistry.getTexture(FeaturesItems.scythe_Silver.namespaceID);
1255+
return model;
1256+
});
1257+
}
11841258
}
11851259
}
11861260

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

Lines changed: 136 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -916,45 +916,6 @@ public void onRecipesReady() {
916916
.create("boomstick", new ItemStack(FeaturesItems.boom_stick));
917917
}
918918

919-
if (FeaturesMain.moonmoonmoonOn){
920-
if (FeaturesItems.paxelsEnabled == 1) {
921-
RecipeBuilder.Shaped(MOD_ID)
922-
.setShape("APH", " W ", " S ")
923-
.addInput('S', Items.STICK)
924-
.addInput('A', MoonSteelItems.TOOL_AXE_MOONSTEEL)
925-
.addInput('P', MoonSteelItems.TOOL_PICKAXE_MOONSTEEL)
926-
.addInput('H', MoonSteelItems.TOOL_SHOVEL_MOONSTEEL)
927-
.addInput('W', MoonSteelItems.TOOL_SWORD_MOONSTEEL)
928-
.create("paxelcraft", new ItemStack(FeaturesItems.paxel_Moonsteel));
929-
}
930-
931-
if (FeaturesItems.climbPickaxesEnabled == 1) {
932-
RecipeBuilder.Shaped(MOD_ID)
933-
.setShape("MM ", "MSH", " S ")
934-
.addInput('S', Items.STICK)
935-
.addInput('M', MoonSteelItems.INGOT_MOONSTEEL)
936-
.addInput('H', MoonSteelBlocks.BLOCK_MOONSTEEL)
937-
.create("climbpickcraft", new ItemStack(FeaturesItems.climb_pickaxe_Monnsteel));
938-
}
939-
940-
if (FeaturesItems.miningHammersEnabled == 1) {
941-
RecipeBuilder.Shaped(MOD_ID)
942-
.setShape("HMH", "MSM", " S ")
943-
.addInput('S', Items.STICK)
944-
.addInput('M', MoonSteelItems.INGOT_MOONSTEEL)
945-
.addInput('H', MoonSteelBlocks.BLOCK_MOONSTEEL)
946-
.create("hammercraft", new ItemStack(FeaturesItems.mining_hammer_MoonSteel));
947-
}
948-
949-
if (FeaturesItems.normalCrownsEnabled == 1) {
950-
RecipeBuilder.Shaped(MOD_ID)
951-
.setShape("HCH", "HHH")
952-
.addInput('H', MoonSteelItems.INGOT_MOONSTEEL)
953-
.addInput('C', Items.CLOTH)
954-
.create("crown", new ItemStack(FeaturesItems.moonsteel_Crown, 1));
955-
}
956-
}
957-
958919
if (FeaturesBlocks.newFlowersEnabled == 1){
959920
RecipeBuilder.Shapeless(MOD_ID)
960921
.addInput(FeaturesBlocks.white_Flower)
@@ -997,6 +958,110 @@ public void onRecipesReady() {
997958
.create("blackflowertodye", new ItemStack(Items.DYE, 2, 0));
998959
}
999960

961+
if (FeaturesBlocks.woodMeshEnabled == 1) {
962+
RecipeBuilder.Shaped(MOD_ID)
963+
.setShape("SSS", "S S", "SSS")
964+
.addInput('S', Items.STICK)
965+
.create("woodmesh", new ItemStack(FeaturesBlocks.wood_Mesh));
966+
}
967+
968+
if (FeaturesItems.scytheEnabled == 1){
969+
int[] toolMaterial = {
970+
Items.INGOT_IRON.id,
971+
Items.INGOT_GOLD.id,
972+
Items.DIAMOND.id,
973+
Items.INGOT_STEEL.id
974+
};
975+
int[] toolHeavyMaterial = {
976+
Blocks.BLOCK_IRON.id(),
977+
Blocks.BLOCK_GOLD.id(),
978+
Blocks.BLOCK_DIAMOND.id(),
979+
Blocks.BLOCK_STEEL.id()
980+
};
981+
Item[] scytheResult = {
982+
FeaturesItems.scythe_Iron,
983+
FeaturesItems.scythe_Gold,
984+
FeaturesItems.scythe_Diamond,
985+
FeaturesItems.scythe_Steel
986+
};
987+
988+
String[] scytheNames = {
989+
"iron",
990+
"gold",
991+
"diamond",
992+
"steel"
993+
};
994+
995+
RecipeBuilder.Shaped(MOD_ID)
996+
.setShape(" MH", "M S", " S")
997+
.addInput('S', Items.STICK)
998+
.addInput('H', "minecraft:logs")
999+
.addInput('M', "minecraft:planks")
1000+
.create("scythecraftwood", new ItemStack(FeaturesItems.mining_Hammer_Wood));
1001+
RecipeBuilder.Shaped(MOD_ID)
1002+
.setShape(" MH", "M S", " S")
1003+
.addInput('S', Items.STICK)
1004+
.addInput('H', "minecraft:stones")
1005+
.addInput('M', "minecraft:cobblestones")
1006+
.create("scythecraftstone", new ItemStack(FeaturesItems.mining_Hammer_Stone));
1007+
for (int i = 0; i < 4; i++){
1008+
RecipeBuilder.Shaped(MOD_ID)
1009+
.setShape(" MH", "M S", " S")
1010+
.addInput('S', Items.STICK)
1011+
.addInput('H', Item.itemsList[toolHeavyMaterial[i]])
1012+
.addInput('M', Item.itemsList[toolMaterial[i]])
1013+
.create("scythecraft" + scytheNames[i], new ItemStack(scytheResult[i]));
1014+
}
1015+
}
1016+
1017+
if (FeaturesMain.moonmoonmoonOn){
1018+
if (FeaturesItems.paxelsEnabled == 1) {
1019+
RecipeBuilder.Shaped(MOD_ID)
1020+
.setShape("APH", " W ", " S ")
1021+
.addInput('S', Items.STICK)
1022+
.addInput('A', MoonSteelItems.TOOL_AXE_MOONSTEEL)
1023+
.addInput('P', MoonSteelItems.TOOL_PICKAXE_MOONSTEEL)
1024+
.addInput('H', MoonSteelItems.TOOL_SHOVEL_MOONSTEEL)
1025+
.addInput('W', MoonSteelItems.TOOL_SWORD_MOONSTEEL)
1026+
.create("paxelcraftmoonsteel", new ItemStack(FeaturesItems.paxel_Moonsteel));
1027+
}
1028+
1029+
if (FeaturesItems.climbPickaxesEnabled == 1) {
1030+
RecipeBuilder.Shaped(MOD_ID)
1031+
.setShape("MM ", "MSH", " S ")
1032+
.addInput('S', Items.STICK)
1033+
.addInput('M', MoonSteelItems.INGOT_MOONSTEEL)
1034+
.addInput('H', MoonSteelBlocks.BLOCK_MOONSTEEL)
1035+
.create("climbpickcraftmoonsteel", new ItemStack(FeaturesItems.climb_pickaxe_Monnsteel));
1036+
}
1037+
1038+
if (FeaturesItems.miningHammersEnabled == 1) {
1039+
RecipeBuilder.Shaped(MOD_ID)
1040+
.setShape("HMH", "MSM", " S ")
1041+
.addInput('S', Items.STICK)
1042+
.addInput('M', MoonSteelItems.INGOT_MOONSTEEL)
1043+
.addInput('H', MoonSteelBlocks.BLOCK_MOONSTEEL)
1044+
.create("hammercraftmoonsteel", new ItemStack(FeaturesItems.mining_hammer_MoonSteel));
1045+
}
1046+
1047+
if (FeaturesItems.normalCrownsEnabled == 1) {
1048+
RecipeBuilder.Shaped(MOD_ID)
1049+
.setShape("HCH", "HHH")
1050+
.addInput('H', MoonSteelItems.INGOT_MOONSTEEL)
1051+
.addInput('C', Items.CLOTH)
1052+
.create("crownmoonsteel", new ItemStack(FeaturesItems.moonsteel_Crown, 1));
1053+
}
1054+
1055+
if (FeaturesItems.scytheEnabled == 1){
1056+
RecipeBuilder.Shaped(MOD_ID)
1057+
.setShape(" MH", "M S", " S")
1058+
.addInput('S', Items.STICK)
1059+
.addInput('H', MoonSteelBlocks.BLOCK_MOONSTEEL)
1060+
.addInput('M', MoonSteelItems.INGOT_MOONSTEEL)
1061+
.create("scythecraftmoonsteel", new ItemStack(FeaturesItems.scythe_MoonSteel));
1062+
}
1063+
}
1064+
10001065
if (FeaturesMain.deepOn){
10011066
if (FeaturesItems.paxelsEnabled == 1) {
10021067
RecipeBuilder.Shaped(MOD_ID)
@@ -1006,23 +1071,23 @@ public void onRecipesReady() {
10061071
.addInput('P', DEEPItems.amethystPickaxe)
10071072
.addInput('H', DEEPItems.amethystShovel)
10081073
.addInput('W', DEEPItems.amethystSword)
1009-
.create("paxelcraft", new ItemStack(FeaturesItems.paxel_Amethyst));
1074+
.create("paxelcraftamethyst", new ItemStack(FeaturesItems.paxel_Amethyst));
10101075
RecipeBuilder.Shaped(MOD_ID)
10111076
.setShape("APH", " W ", " S ")
10121077
.addInput('S', Items.STICK)
10131078
.addInput('A', DEEPItems.silverAxe)
10141079
.addInput('P', DEEPItems.silverPickaxe)
10151080
.addInput('H', DEEPItems.silverShovel)
10161081
.addInput('W', DEEPItems.silverSword)
1017-
.create("paxelcraft", new ItemStack(FeaturesItems.paxel_Silver));
1082+
.create("paxelcraftsilver", new ItemStack(FeaturesItems.paxel_Silver));
10181083
RecipeBuilder.Shaped(MOD_ID)
10191084
.setShape("APH", " W ", " S ")
10201085
.addInput('S', Items.STICK)
10211086
.addInput('A', DEEPItems.leadAxe)
10221087
.addInput('P', DEEPItems.leadPickaxe)
10231088
.addInput('H', DEEPItems.leadShovel)
10241089
.addInput('W', DEEPItems.leadSword)
1025-
.create("paxelcraft", new ItemStack(FeaturesItems.paxel_Lead));
1090+
.create("paxelcraftlead", new ItemStack(FeaturesItems.paxel_Lead));
10261091
}
10271092

10281093
if (FeaturesItems.climbPickaxesEnabled == 1) {
@@ -1031,19 +1096,19 @@ public void onRecipesReady() {
10311096
.addInput('S', Items.STICK)
10321097
.addInput('M', DEEPItems.amethyst)
10331098
.addInput('H', DEEPBlocks.amethystBlock)
1034-
.create("climbpickcraft", new ItemStack(FeaturesItems.climb_pickaxe_Amethyst));
1099+
.create("climbpickcraftamethyst", new ItemStack(FeaturesItems.climb_pickaxe_Amethyst));
10351100
RecipeBuilder.Shaped(MOD_ID)
10361101
.setShape("MM ", "MSH", " S ")
10371102
.addInput('S', Items.STICK)
10381103
.addInput('M', DEEPItems.ingotSilver)
10391104
.addInput('H', DEEPBlocks.silverBlock)
1040-
.create("climbpickcraft", new ItemStack(FeaturesItems.climb_pickaxe_Silver));
1105+
.create("climbpickcraftsilver", new ItemStack(FeaturesItems.climb_pickaxe_Silver));
10411106
RecipeBuilder.Shaped(MOD_ID)
10421107
.setShape("MM ", "MSH", " S ")
10431108
.addInput('S', Items.STICK)
10441109
.addInput('M', DEEPItems.ingotLead)
10451110
.addInput('H', DEEPBlocks.leadBlock)
1046-
.create("climbpickcraft", new ItemStack(FeaturesItems.climb_pickaxe_Lead));
1111+
.create("climbpickcraftlead", new ItemStack(FeaturesItems.climb_pickaxe_Lead));
10471112
}
10481113

10491114
if (FeaturesItems.miningHammersEnabled == 1) {
@@ -1052,32 +1117,53 @@ public void onRecipesReady() {
10521117
.addInput('S', Items.STICK)
10531118
.addInput('M', DEEPItems.amethyst)
10541119
.addInput('H', DEEPBlocks.amethystBlock)
1055-
.create("hammercraft", new ItemStack(FeaturesItems.mining_hammer_Amethyst));
1120+
.create("hammercraftamethyst", new ItemStack(FeaturesItems.mining_hammer_Amethyst));
10561121
RecipeBuilder.Shaped(MOD_ID)
10571122
.setShape("HMH", "MSM", " S ")
10581123
.addInput('S', Items.STICK)
10591124
.addInput('M', DEEPItems.ingotSilver)
10601125
.addInput('H', DEEPBlocks.silverBlock)
1061-
.create("hammercraft", new ItemStack(FeaturesItems.mining_hammer_Silver));
1126+
.create("hammercraftsilver", new ItemStack(FeaturesItems.mining_hammer_Silver));
10621127
RecipeBuilder.Shaped(MOD_ID)
10631128
.setShape("HMH", "MSM", " S ")
10641129
.addInput('S', Items.STICK)
10651130
.addInput('M', DEEPItems.ingotLead)
10661131
.addInput('H', DEEPBlocks.leadBlock)
1067-
.create("hammercraft", new ItemStack(FeaturesItems.mining_hammer_Lead));
1132+
.create("hammercraftlead", new ItemStack(FeaturesItems.mining_hammer_Lead));
10681133
}
10691134

10701135
if (FeaturesItems.normalCrownsEnabled == 1){
10711136
RecipeBuilder.Shaped(MOD_ID)
10721137
.setShape("HCH", "HHH")
10731138
.addInput('H', DEEPItems.amethyst)
10741139
.addInput('C', Items.CLOTH)
1075-
.create("crown", new ItemStack(FeaturesItems.amethyst_Crown, 1));
1140+
.create("crownamethyst", new ItemStack(FeaturesItems.amethyst_Crown, 1));
10761141
RecipeBuilder.Shaped(MOD_ID)
10771142
.setShape("HCH", "HHH")
10781143
.addInput('H', DEEPItems.ingotSilver)
10791144
.addInput('C', Items.CLOTH)
1080-
.create("crown", new ItemStack(FeaturesItems.silver_Crown, 1));
1145+
.create("crownsilver", new ItemStack(FeaturesItems.silver_Crown, 1));
1146+
}
1147+
1148+
if (FeaturesItems.scytheEnabled == 1){
1149+
RecipeBuilder.Shaped(MOD_ID)
1150+
.setShape(" MH", "M S", " S")
1151+
.addInput('S', Items.STICK)
1152+
.addInput('H', DEEPBlocks.amethystBlock)
1153+
.addInput('M', DEEPItems.amethyst)
1154+
.create("scythecraftamethyst", new ItemStack(FeaturesItems.scythe_Amethyst));
1155+
RecipeBuilder.Shaped(MOD_ID)
1156+
.setShape(" MH", "M S", " S")
1157+
.addInput('S', Items.STICK)
1158+
.addInput('M', DEEPItems.ingotLead)
1159+
.addInput('H', DEEPBlocks.leadBlock)
1160+
.create("scythecraftlead", new ItemStack(FeaturesItems.scythe_Lead));
1161+
RecipeBuilder.Shaped(MOD_ID)
1162+
.setShape(" MH", "M S", " S")
1163+
.addInput('S', Items.STICK)
1164+
.addInput('M', DEEPItems.ingotSilver)
1165+
.addInput('H', DEEPBlocks.silverBlock)
1166+
.create("scythecraftsilver", new ItemStack(FeaturesItems.scythe_Silver));
10811167
}
10821168
}
10831169
}

0 commit comments

Comments
 (0)