diff --git a/src/main/java/gregtechfoodoption/block/GTFOCrops.java b/src/main/java/gregtechfoodoption/block/GTFOCrops.java index edda7c97..15b1acd0 100644 --- a/src/main/java/gregtechfoodoption/block/GTFOCrops.java +++ b/src/main/java/gregtechfoodoption/block/GTFOCrops.java @@ -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); diff --git a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java index 96de37f5..189863a5 100644 --- a/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java +++ b/src/main/java/gregtechfoodoption/item/GTFOMetaItem.java @@ -371,6 +371,9 @@ public class GTFOMetaItem extends MetaItem 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; @@ -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 diff --git a/src/main/java/gregtechfoodoption/recipe/chain/CoreChain.java b/src/main/java/gregtechfoodoption/recipe/chain/CoreChain.java index 90644319..7f6c6bdf 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/CoreChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/CoreChain.java @@ -46,8 +46,11 @@ public static void init() { slicingRecipes(); corn(); lithiumCarbonate(); + cotton(); } + + public static void zest() { EXTRACTOR_RECIPES.recipeBuilder() .inputs(LEMON.getStackForm()) @@ -612,4 +615,9 @@ public static void corn() { public static void lithiumCarbonate() { } + + public static void cotton() { + ModHandler.addShapelessRecipe("gtfo_cotton_to_string", new ItemStack(Items.STRING, 1), COTTON.getStackForm(), COTTON.getStackForm(), COTTON.getStackForm()); + ModHandler.addShapelessRecipe("gtfo_hand_cotton_seed", COTTON_SEED.getStackForm(), COTTON.getStackForm()); + } } diff --git a/src/main/java/gregtechfoodoption/recipe/chain/SeedsChain.java b/src/main/java/gregtechfoodoption/recipe/chain/SeedsChain.java index 2956eadc..6c9d9700 100644 --- a/src/main/java/gregtechfoodoption/recipe/chain/SeedsChain.java +++ b/src/main/java/gregtechfoodoption/recipe/chain/SeedsChain.java @@ -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(), diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/component/cotton.json b/src/main/resources/assets/gregtech/models/item/metaitems/component/cotton.json new file mode 100644 index 00000000..6f3f3eee --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/component/cotton.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/component/cotton" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/seed/cotton.json b/src/main/resources/assets/gregtech/models/item/metaitems/seed/cotton.json new file mode 100644 index 00000000..3a462c30 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/seed/cotton.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/seed/cotton" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/component/cotton.png b/src/main/resources/assets/gregtech/textures/items/metaitems/component/cotton.png new file mode 100644 index 00000000..7bc9a367 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/component/cotton.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/seed/cotton.png b/src/main/resources/assets/gregtech/textures/items/metaitems/seed/cotton.png new file mode 100644 index 00000000..9e75afd8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/seed/cotton.png differ diff --git a/src/main/resources/assets/gregtechfoodoption/blockstates/crop_cotton.json b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_cotton.json new file mode 100644 index 00000000..6505c24c --- /dev/null +++ b/src/main/resources/assets/gregtechfoodoption/blockstates/crop_cotton.json @@ -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": {} + } + } +} diff --git a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang index f4c0b7c1..40e8945f 100644 --- a/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang +++ b/src/main/resources/assets/gregtechfoodoption/lang/en_us.lang @@ -995,6 +995,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 @@ -1108,6 +1110,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: diff --git a/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage0.png b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage0.png new file mode 100644 index 00000000..a29d373f Binary files /dev/null and b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage0.png differ diff --git a/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage1.png b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage1.png new file mode 100644 index 00000000..e825877e Binary files /dev/null and b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage1.png differ diff --git a/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage2.png b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage2.png new file mode 100644 index 00000000..90b051de Binary files /dev/null and b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage2.png differ diff --git a/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage3.png b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage3.png new file mode 100644 index 00000000..6ab921b9 Binary files /dev/null and b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage3.png differ diff --git a/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage4.png b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage4.png new file mode 100644 index 00000000..73c68ccc Binary files /dev/null and b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage4.png differ diff --git a/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage5.png b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage5.png new file mode 100644 index 00000000..521e6675 Binary files /dev/null and b/src/main/resources/assets/gregtechfoodoption/textures/crop/crop_cotton/stage5.png differ