Merge pull request #1010 from MCTian-mi/mod-updates

Update GTFO, migrate to gtfo cotton, and buff the cotton -> string chain by 4 x
SymmetricDevs · Oct 6, 2024 · a893c0d · a893c0d
2 parents 7848742 + aa8ad16
commit a893c0d
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 47 deletions.
diff --git a/groovy/postInit/biology/GreenhouseChain.groovy b/groovy/postInit/biology/GreenhouseChain.groovy
@@ -28,30 +28,17 @@ mods.gregtech.assembler.removeByInput(24, [metaitem('gregtechfoodoption:cupric_h
 
 //COTTON RECIPES
 
-crafting.addShaped("susy:cotton_seeds", metaitem('seed.cotton') * 2, [
- [null, null, null],
- [null, null, null],
- [null, metaitem('gregtechfoodoption:seed.unknown'), metaitem('gregtechfoodoption:seed.unknown')]
-])
-
 EXTRUDER.recipeBuilder()
- .inputs(metaitem('crop.cotton') * 20)
+ .inputs(metaitem('gregtechfoodoption:component.cotton') * 20)
  .notConsumable(ore('gearSteel') * 8)
- .outputs(metaitem('seed.cotton') * 5)
+ .outputs(metaitem('gregtechfoodoption:seed.cotton') * 5)
  .outputs(metaitem('stem.cotton') * 5)
  .outputs(metaitem('fiberCotton') * 40)
  .EUt(7)
  .duration(80)
  .buildAndRegister()
 
-EXTRACTOR.recipeBuilder()
- .inputs(metaitem('seed.cotton'))
- .fluidOutputs(fluid('seed_oil') * 10)
- .EUt(2)
- .duration(32)
- .buildAndRegister()
-
-crafting.addShapeless('string.cotton', item('minecraft:string'), [
+crafting.addShapeless('string.cotton', item('minecraft:string') * 4, [
  metaitem('threadCotton')
 ]) 
 
@@ -913,4 +900,4 @@ generateGreenhouseCropRecipes('warm_humid_greenhouse_gases', metaitem('gregtechf
 
 //CUSTOM CROPS
 
-generateGreenhouseCropRecipes('warm_humid_greenhouse_gases', metaitem('seed.cotton'), metaitem('crop.cotton'), 20)
+generateGreenhouseCropRecipes('warm_humid_greenhouse_gases', metaitem('gregtechfoodoption:seed.cotton'), metaitem('gregtechfoodoption:component.cotton'), 20)
diff --git a/groovy/preInit/RegisterMetaItems.groovy b/groovy/preInit/RegisterMetaItems.groovy
@@ -331,9 +331,8 @@ eventManager.listen {
 
  //Crops 9000-10000
 
- customMetaItems.addItem(9000, "seed.cotton");
- customMetaItems.addItem(9001, "crop.cotton");
- customMetaItems.addItem(9002, "stem.cotton");
+ // 9000 & 9001
+ customMetaItems.addItem(9000, "stem.cotton");
 
  // Train Stuff 10000-10100
 

diff --git a/manifest.json b/manifest.json
@@ -287,7 +287,7 @@
  },
  {
  "projectID": 477021,
- "fileID": 5585788,
+ "fileID": 5778294,
  "required": true
  },
  {

diff --git a/resources/gregtech/models/item/metaitems/crop.cotton.json b/resources/gregtech/models/item/metaitems/crop.cotton.json
diff --git a/resources/gregtech/models/item/metaitems/seed.cotton.json b/resources/gregtech/models/item/metaitems/seed.cotton.json
diff --git a/resources/gregtech/textures/items/metaitems/crop.cotton.png b/resources/gregtech/textures/items/metaitems/crop.cotton.png
diff --git a/resources/gregtech/textures/items/metaitems/seed.cotton.png b/resources/gregtech/textures/items/metaitems/seed.cotton.png
diff --git a/resources/langfiles/lang/en_pt.lang b/resources/langfiles/lang/en_pt.lang
@@ -2117,9 +2117,6 @@ metaitem.fused_quartz.name=Fused Quartz Plate
 metaitem.crucible.quartz.name=Quartz Crucible
 metaitem.crucible.graphite.name=Graphite Crucible
 
-metaitem.seed.cotton.name=Cotton Seed
-metaitem.crop.cotton.name=Cotton
-
 metaitem.vti_rich_pig_iron.name=Vanadium/Titanium-Rich Pig Iron
 metaitem.vt_slag.name=Vanadium/Titanium-Rich Slag
 metaitem.sponge.titanium.name=Titanium Sponge

diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang
@@ -2337,9 +2337,6 @@ metaitem.fused_quartz.name=Fused Quartz Plate
 metaitem.crucible.quartz.name=Quartz Crucible
 metaitem.crucible.graphite.name=Graphite Crucible
 
-metaitem.seed.cotton.name=Cotton Seed
-metaitem.crop.cotton.name=Cotton
-
 metaitem.vti_rich_pig_iron.name=Vanadium/Titanium-Rich Pig Iron
 metaitem.vt_slag.name=Vanadium/Titanium-Rich Slag
 metaitem.sponge.titanium.name=Titanium Sponge

diff --git a/resources/langfiles/lang/pl_pl.lang b/resources/langfiles/lang/pl_pl.lang
@@ -2247,9 +2247,6 @@ metaitem.fused_quartz.name=Fused Quartz Plate
 metaitem.crucible.quartz.name=Quartz Crucible
 metaitem.crucible.graphite.name=Graphite Crucible
 
-metaitem.seed.cotton.name=Cotton Seed
-metaitem.crop.cotton.name=Cotton
-
 metaitem.vti_rich_pig_iron.name=Vanadium/Titanium-Rich Pig Iron
 metaitem.vt_slag.name=Vanadium/Titanium-Rich Slag
 metaitem.sponge.titanium.name=Titanium Sponge

diff --git a/resources/langfiles/lang/ru_RU.lang b/resources/langfiles/lang/ru_RU.lang
@@ -2331,9 +2331,6 @@ metaitem.fused_quartz.name=Пластина из плавленого кварц
 metaitem.crucible.quartz.name=Кварцевый тигель
 metaitem.crucible.graphite.name=Графитовый тигель
 
-metaitem.seed.cotton.name=Семена хлопка
-metaitem.crop.cotton.name=Хлопок
-
 metaitem.vti_rich_pig_iron.name=Чугун с высоким содержанием ванадия и титана
 metaitem.vt_slag.name=Шлак с высоким содержанием ванадия/титана
 metaitem.sponge.titanium.name=Титановая губка

diff --git a/resources/langfiles/lang/zh_cn.lang b/resources/langfiles/lang/zh_cn.lang
@@ -2237,8 +2237,6 @@ metaitem.fused_quartz.name=烧结石英板
 metaitem.crucible.quartz.name=石英坩埚
 metaitem.crucible.graphite.name=石墨坩埚
 
-metaitem.seed.cotton.name=棉花种子
-metaitem.crop.cotton.name=棉花
 
 metaitem.vti_rich_pig_iron.name=富钒-钛生铁
 metaitem.vt_slag.name=富钒-钛渣