Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port cotton from susy #81

Merged
merged 1 commit into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/gregtechfoodoption/block/GTFOCrops.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class GTFOCrops {
public static GTFOCrop CROP_BLACK_PEPPER = GTFOCrop.create("black_pepper");
public static GTFOCrop CROP_RICE = GTFOCrop.create("rice");
public static GTFOCrop CROP_WHITE_GRAPE = GTFOCrop.create("white_grape");
public static GTFOCrop CROP_COTTON = GTFOCrop.create("cotton");

public static GTFOBerryBush BUSH_BLUEBERRY = GTFOBerryBush.create("blueberry");
public static GTFOBerryBush BUSH_BLACKBERRY = GTFOBerryBush.create("blackberry").setThorny(true);
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/gregtechfoodoption/item/GTFOMetaItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,9 @@ public class GTFOMetaItem extends MetaItem<GTFOMetaItem.GTFOMetaValueItem> imple
public static MetaItem<?>.MetaValueItem WHITE_GRAPES;
public static MetaItem<?>.MetaValueItem WHITE_GRAPE_SEED;

public static MetaItem<?>.MetaValueItem COTTON;
public static MetaItem<?>.MetaValueItem COTTON_SEED;

public static MetaItem<?>.MetaValueItem UNFIRED_PLATE;
public static MetaItem<?>.MetaValueItem UNFIRED_BOWL;

Expand Down Expand Up @@ -1178,6 +1181,9 @@ public void registerSubItems() {
WHITE_GRAPES = addItem(320, "food.white_grapes").addComponents(new GTFOFoodStats(1, 1f).nutrients(0f, 1f, 0f, 0f, 0f));
WHITE_GRAPE_SEED = addItem(321, "seed.white_grape");
WHITE_GRAPE_SEED.addComponents(new GTFOCropSeedBehaviour(GTFOCrops.CROP_WHITE_GRAPE, WHITE_GRAPE_SEED.getStackForm(), WHITE_GRAPES.getStackForm()));
COTTON = addItem(9001, "component.cotton");
COTTON_SEED = addItem(9000, "seed.cotton");
COTTON_SEED.addComponents(new GTFOCropSeedBehaviour(GTFOCrops.CROP_COTTON, COTTON_SEED.getStackForm(), COTTON.getStackForm()));


// 175-189 left blank for organic circuits
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/gregtechfoodoption/recipe/chain/SeedsChain.java
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ public static void init() {
ModHandler.addShapedRecipe("gtfo_seed_white_grapes_ungenerify", WHITE_GRAPE_SEED.getStackForm(2),
" S", " S ", " ",
'S', GTFOMetaItem.UNKNOWN_SEED);
ModHandler.addShapedRecipe("gtfo_seed_cotton_ungenerify", COTTON_SEED.getStackForm(2),
" ", " ", " SS",
'S', GTFOMetaItem.UNKNOWN_SEED);


ModHandler.addShapelessRecipe("gtfo_seed_soy_extraction", GTFOMetaItem.SOYBEAN_SEED.getStackForm(),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/component/cotton"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/seed/cotton"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"forge_marker": 1,
"defaults": {
"model": "crop"
},
"variants": {
"age": {
"0": {
"textures": {
"crop": "gregtechfoodoption:crop/crop_cotton/stage0"
}
},
"1": {
"textures": {
"crop": "gregtechfoodoption:crop/crop_cotton/stage1"
}
},
"2": {
"textures": {
"crop": "gregtechfoodoption:crop/crop_cotton/stage2"
}
},
"3": {
"textures": {
"crop": "gregtechfoodoption:crop/crop_cotton/stage3"
}
},
"4": {
"textures": {
"crop": "gregtechfoodoption:crop/crop_cotton/stage4"
}
},
"5": {
"textures": {
"crop": "gregtechfoodoption:crop/crop_cotton/stage5"
}
},
"6": {},
"7": {}
}
}
}
3 changes: 3 additions & 0 deletions src/main/resources/assets/gregtechfoodoption/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,8 @@ metaitem.component.rice.name=Rice
metaitem.component.rice.tooltip=Also works as a Seed
metaitem.component.nutmeg.name=Nutmeg Seeds
metaitem.seed.white_grape.name=White Grape Seeds
metaitem.component.cotton.name=Cotton
metaitem.seed.cotton.name=Cotton Seeds
metaitem.shape.pasta.blank.name=Blank Pasta Extruder Shape
metaitem.shape.pasta.tagliatelle.name=Tagliatelle Pasta Extruder Shape
metaitem.shape.pasta.spaghetti.name=Spaghetti Pasta Extruder Shape
Expand Down Expand Up @@ -1102,6 +1104,7 @@ tile.gtfo_crop_artichoke.name=Artichoke
tile.gtfo_crop_black_pepper.name=Black Pepper
tile.gtfo_crop_rice.name=Rice
tile.gtfo_crop_white_grape.name=White Grape
tile.gtfo_crop_cotton.name=Cotton

lacing.item_list.name=Lacing Recipe
gregtechfoodoption.lacing.info.1=Applies effect:
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading