British localisation & Removal of a trademarked brand name. (#73)

* Create en_gb.lang

Potato Chips are now Potato Crisps.

* british

* the culling and -ise-ing

* Removing a potential trademark violation

build.gradle

@@ -1,4 +1,4 @@
-//version: 1719793363
+//version: 1720106721
 /*
  * DO NOT CHANGE THIS FILE!
  * Also, you may replace this file at any time if there is an update available.
@@ -33,9 +33,9 @@ plugins {
     id 'base'
     id 'eclipse'
     id 'maven-publish'
-    id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.7'
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.33'
-    id 'net.darkhax.curseforgegradle' version '1.1.18' apply false
+    id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.8'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.4.0'
+    id 'net.darkhax.curseforgegradle' version '1.1.24' apply false
     id 'com.modrinth.minotaur' version '2.8.7' apply false
     id 'com.diffplug.spotless' version '6.13.0' apply false
     id 'com.palantir.git-version' version '3.0.0' apply false
@@ -78,8 +78,10 @@ propertyDefaultIfUnset("gradleTokenVersion", "")
 propertyDefaultIfUnset("useSrcApiPath", false)
 propertyDefaultIfUnset("includeWellKnownRepositories", true)
 propertyDefaultIfUnset("includeCommonDevEnvMods", true)
+propertyDefaultIfUnset("stripForgeRequirements", false)
 propertyDefaultIfUnset("noPublishedSources", false)
 propertyDefaultIfUnset("forceEnableMixins", false)
+propertyDefaultIfUnset("mixinConfigRefmap", "mixins.${project.modId}.refmap.json")
 propertyDefaultIfUnsetWithEnvVar("enableCoreModDebug", false, "CORE_MOD_DEBUG")
 propertyDefaultIfUnset("generateMixinConfig", true)
 propertyDefaultIfUnset("usesShadowedDependencies", false)
@@ -525,7 +527,7 @@ dependencies {
         // should use 2.8.6 but 2.8.9+ has a vulnerability fix
         annotationProcessor 'com.google.code.gson:gson:2.8.9'
 
-        mixinProviderSpec = modUtils.enableMixins(mixinProviderSpec, "mixins.${modId}.refmap.json")
+        mixinProviderSpec = modUtils.enableMixins(mixinProviderSpec, mixinConfigRefmap)
         api (mixinProviderSpec) {
             transitive = false
         }
@@ -567,6 +569,10 @@ dependencies {
         transitive = false
     }
 
+    if ((usesMixins.toBoolean() || forceEnableMixins.toBoolean()) && stripForgeRequirements.toBoolean()) {
+        runtimeOnlyNonPublishable 'com.cleanroommc:strip-latest-forge-requirements:1.0'
+    }
+
     if (includeCommonDevEnvMods.toBoolean()) {
         if (!(modId.equals('jei'))) {
             implementation 'mezz.jei:jei_1.12.2:4.16.1.302'
@@ -700,7 +706,6 @@ tasks.register('generateAssets') {
         if (usesMixins.toBoolean() && generateMixinConfig.toBoolean()) {
             def mixinConfigFile = getFile("src/main/resources/mixins.${modId}.json")
             if (!mixinConfigFile.exists()) {
-                def mixinConfigRefmap = "mixins.${modId}.refmap.json"
 
                 mixinConfigFile.text = """{
   "package": "${modGroup}.${mixinsPackage}",

src/main/java/gregtechfoodoption/item/GTFOMetaItem.java

@@ -46,11 +46,11 @@ public class GTFOMetaItem extends MetaItem<GTFOMetaItem.GTFOMetaValueItem> imple
     public static MetaItem<?>.MetaValueItem DRIED_CORN_EAR;
     public static MetaItem<?>.MetaValueItem CORN_EAR;
     public static MetaItem<?>.MetaValueItem PHYCOMYCES_BLAKESLEEANUS_CULTURE;
-    public static MetaItem<?>.MetaValueItem THERMOS;
-    public static MetaItem<?>.MetaValueItem THERMOS_CASING;
-    public static MetaItem<?>.MetaValueItem THERMOS_CAP;
-    public static MetaItem<?>.MetaValueItem LEACHED_THERMOS_CASING;
-    public static MetaItem<?>.MetaValueItem USED_THERMOS;
+    public static MetaItem<?>.MetaValueItem DEWAR_FLASK;
+    public static MetaItem<?>.MetaValueItem DEWAR_FLASK_CASING;
+    public static MetaItem<?>.MetaValueItem DEWAR_FLASK_CAP;
+    public static MetaItem<?>.MetaValueItem LEACHED_DEWAR_FLASK_CASING;
+    public static MetaItem<?>.MetaValueItem USED_DEWAR_FLASK;
     public static MetaItem<?>.MetaValueItem MINERAL_WATER;
     public static MetaItem<?>.MetaValueItem CORED_APPLE;
     public static MetaItem<?>.MetaValueItem APPLE_HARD_CANDY;
@@ -421,11 +421,11 @@ public void registerSubItems() {
         CORN_EAR.addComponents(new GTFOCropSeedBehaviour(GTFOCrops.CROP_CORN, BareCornKernel.getItemStack(), CORN_EAR.getStackForm()));
         //PHYCOMYCES_BLAKESLEEANUS_CULTURE = addItem(6, "culture.phycomyces");
 
-        THERMOS = addItem(7, "component.thermos.new").blacklistKitchen();
-        USED_THERMOS = addItem(8, "component.thermos.used").blacklistKitchen();
-        LEACHED_THERMOS_CASING = addItem(9, "component.thermos.casing_leached").blacklistKitchen();
-        THERMOS_CAP = addItem(10, "component.thermos.cap").blacklistKitchen();
-        THERMOS_CASING = addItem(11, "component.thermos.casing").blacklistKitchen();
+        DEWAR_FLASK = addItem(7, "component.dewar_flask.new").blacklistKitchen();
+        USED_DEWAR_FLASK = addItem(8, "component.dewar_flask.used").blacklistKitchen();
+        LEACHED_DEWAR_FLASK_CASING = addItem(9, "component.dewar_flask.casing_leached").blacklistKitchen();
+        DEWAR_FLASK_CAP = addItem(10, "component.dewar_flask.cap").blacklistKitchen();
+        DEWAR_FLASK_CASING = addItem(11, "component.dewar_flask.casing").blacklistKitchen();
 
         CORED_APPLE = addItem(13, "component.cored_apple");
         PLASTIC_BOTTLE = addItem(15, "component.plastic_bottle").blacklistKitchen();
@@ -627,7 +627,7 @@ public void registerSubItems() {
         POPCORN_BAG = addItem(0, "food.popcorn_bag").addComponents(new GTFOFoodStats(GTFOConfig.gtfoFoodConfig.popcornHunger, GTFOConfig.gtfoFoodConfig.popcornSaturation, false, true, PAPER_BAG.getStackForm(1),
                 new RandomPotionEffect(getPotionById(10), 300, 1, 0))
                 .nutrients(0, 0, 0.5f, 0, 0));
-        MINERAL_WATER = addItem(12, "food.mineral_water").addComponents(new GTFOFoodStats(GTFOConfig.gtfoFoodConfig.mineralWaterHunger, GTFOConfig.gtfoFoodConfig.mineralWaterSaturation, true, true, USED_THERMOS.getStackForm(1),
+        MINERAL_WATER = addItem(12, "food.mineral_water").addComponents(new GTFOFoodStats(GTFOConfig.gtfoFoodConfig.mineralWaterHunger, GTFOConfig.gtfoFoodConfig.mineralWaterSaturation, true, true, USED_DEWAR_FLASK.getStackForm(1),
                 new RandomPotionEffect(CreativityPotion.INSTANCE, 5000, 0, 0)));
         APPLE_HARD_CANDY = addItem(14, "food.apple_hard_candy").addComponents(new GTFOFoodStats(GTFOConfig.gtfoFoodConfig.hardCandyHunger, GTFOConfig.gtfoFoodConfig.hardCandySaturation, true, false, ItemStack.EMPTY,
                 new RandomPotionEffect(MobEffects.REGENERATION, 1200, 1, 50))

src/main/java/gregtechfoodoption/recipe/chain/MineralWaterChain.java

@@ -6,41 +6,41 @@ public static void init()
     {
 /*        CANNER_RECIPES.recipeBuilder()
                 .fluidInputs(Water.getFluid(1000))
-                .inputs(THERMOS.getStackForm())
+                .inputs(DEWAR_FLASK.getStackForm())
                 .outputs(MINERAL_WATER.getStackForm())
                 .EUt(2)
                 .duration(40)
                 .buildAndRegister();
         ASSEMBLER_RECIPES.recipeBuilder()
-                .inputs(THERMOS_CASING.getStackForm(), THERMOS_CAP.getStackForm())
-                .outputs(THERMOS.getStackForm())
+                .inputs(DEWAR_FLASK_CASING.getStackForm(), DEWAR_FLASK_CAP.getStackForm())
+                .outputs(DEWAR_FLASK.getStackForm())
                 .EUt(4)
                 .duration(40)
                 .buildAndRegister();
         ASSEMBLER_RECIPES.recipeBuilder()
                 .input(foil, Zylon, 2)
                 .input(plateCurved, TungstenSteel, 2)
                 .input(ring, TungstenSteel)
-                .outputs(THERMOS_CAP.getStackForm())
+                .outputs(DEWAR_FLASK_CAP.getStackForm())
                 .EUt(30720)
                 .duration(100)
                 .buildAndRegister();
         DISASSEMBLER_RECIPES.recipeBuilder()
-                .inputs(USED_THERMOS.getStackForm())
-                .outputs(LEACHED_THERMOS_CASING.getStackForm(), THERMOS_CAP.getStackForm())
+                .inputs(USED_DEWAR_FLASK.getStackForm())
+                .outputs(LEACHED_DEWAR_FLASK_CASING.getStackForm(), DEWAR_FLASK_CAP.getStackForm())
                 .EUt(120)
                 .duration(160)
                 .buildAndRegister();
         ASSEMBLER_RECIPES.recipeBuilder()
-                .inputs(GTFOMaterialHandler.PolymoscoviumPentahalide.getItemStack(), LEACHED_THERMOS_CASING.getStackForm())
+                .inputs(GTFOMaterialHandler.PolymoscoviumPentahalide.getItemStack(), LEACHED_DEWAR_FLASK_CASING.getStackForm())
                 .fluidInputs(Polytetrafluoroethylene.getFluid(96))
-                .chancedOutput(THERMOS_CASING.getStackForm(), 5000, 0)
+                .chancedOutput(DEWAR_FLASK_CASING.getStackForm(), 5000, 0)
                 .EUt((V[GAValues.UXV]/16) * 15)
                 .duration(1000)
                 .buildAndRegister();
         ASSEMBLER_RECIPES.recipeBuilder()
                 .inputs(GTFOMaterialHandler.NonToxicPolymoscoviumPentahalideCurvedSheet.getItemStack(2))
-                .outputs(THERMOS_CASING.getStackForm())
+                .outputs(DEWAR_FLASK_CASING.getStackForm())
                 .EUt(V[GAValues.UIV] * 15/16)
                 .duration(400)
                 .buildAndRegister();

src/main/resources/assets/gregtech/models/item/metaitems/component/dewar_flask/cap.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/metaitems/component/dewar_flask/cap"
+  }
+}

src/main/resources/assets/gregtech/models/item/metaitems/component/dewar_flask/casing.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/metaitems/component/dewar_flask/casing"
+  }
+}

src/main/resources/assets/gregtech/models/item/metaitems/component/dewar_flask/casing_leached.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/metaitems/component/dewar_flask/casing_leached"
+  }
+}

src/main/resources/assets/gregtech/models/item/metaitems/component/dewar_flask/new.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/metaitems/component/dewar_flask/new"
+  }
+}

src/main/resources/assets/gregtech/models/item/metaitems/component/dewar_flask/used.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/metaitems/component/dewar_flask/used"
+  }
+}

src/main/resources/assets/gregtechfoodoption/lang/en_gb.lang

@@ -0,0 +1,55 @@
+metaitem.component.corn.ear.name=Maize Ear
+metaitem.component.corn.dried_ear.name=Dried Maize Ear
+metaitem.component.corn.cob.name=Maize Cob
+metaitem.component.corn.flavored_flake.name=Flavoured Popcorn Flake
+metaitem.corn_kernel_gem_chipped.name=Maize Seeds
+metaitem.corn_kernel_bare_gem_chipped.name=Maize Kernel
+metaitem.corn_kernel_graded_gem_chipped.name=Acceptable Maize Kernel
+
+gregtech.material.gtfo_popcorn_flavoring_mixture=Popcorn Flavouring Mixture
+
+gregtech.material.gtfo_energized_coffee=Energising Coffee
+
+metaitem.oligopolymerized_moscovium_pentahalides_dust.name=Oligo-Polymerised Moscovium Pentahalides
+
+gregtech.material.gtfo_highly_polymerized_moscovium_pentahalides=Highly Polymerised Moscovium Pentahalides
+
+metaitem.food.apple_hard_candy.name=Apple Boiled Sweet
+metaitem.hard_candy_plate_dense.name=Boiled Sweet Resin
+metaitem.hard_candy_plate.name=Boiled Sweet Sheet
+metaitem.crushed_hard_candy_crushed.name=Crushed Boiled Sweet
+metaitem.corn_starch_dust.name=Corn Flour
+metaitem.hot_apple_hard_candy_plate.name=Hot Apple Boiled Sweet
+gregtech.material.gtfo_apple_candy_syrup=Apple Sweet Syrup
+
+metaitem.food.reduced_fat_chips.name=Bay Salmon Reduced Fat Crisps
+metaitem.food.kettle_chips.name=Kettle Crisps
+metaitem.food.bag_of_chips.name=Bag O' Crisps
+metaitem.component.partially_filled_chip_bag.name=Partially Filled Bag of Crisps
+metaitem.component.potato.reduced_fat_slice.name=Reduced Fat Potato Crisps
+
+metaitem.food.sandwich.bacon.name=Rasher Sandwich
+metaitem.food.sandwich.bacon.large.name=Large Rasher Sandwich
+
+metaitem.crop.cucumber.tooltip=Not a Gherkin (yet).
+
+metaitem.component.bacon.name=Uncooked Rasher of Bacon
+metaitem.food.bacon.name=Rasher of Bacon
+
+item.gt.tool.butchery_knife.hv.tooltip=§9Mob Deliviniser §c4000
+
+metaitem.food.ice_cream.chip.name=Potato Crisp Ice Cream
+metaitem.food.ice_cream.chip.tooltip=https://tenor.com/view/cat-swim-in-milk-cat-kitty-milk-milk-cat-gif-23473453
+
+gregtech.material.gtfo_pasteurized_milk=Pasteurised Milk
+
+metaitem.food.coffee.energized.name=Energised Coffee Cup
+
+gregtechfoodoption.fluid.fertilizer=§2%d%% effective as a Sprinkler Fertiliser
+gregtech.material.gtfo_fertilizer_solution=Fertiliser Solution
+
+metaitem.food.lasagna.pesto.tooltip=Italians only capitalise the first letter of the first word/proper nouns of titles
+
+gregtech.material.gtfo_unpasteurized_skimmed_milk=Unpasteurised Skimmed Milk
+
+tile.gtfo_crop_corn.name=Maize

src/main/resources/assets/gregtechfoodoption/lang/en_us.lang

@@ -84,11 +84,11 @@ gregtech.material.gtfo_energized_coffee=Energizing Coffee
 
 metaitem.food.mineral_water.name=Mineral Water
 metaitem.food.mineral_water.tooltip=Checkmate, atheists.
-metaitem.component.thermos.casing.name=Thermos Casing
-metaitem.component.thermos.cap.name=Thermos Cap
-metaitem.component.thermos.casing_leached.name=Leached Thermos Casing
-metaitem.component.thermos.used.name=Used Thermos
-metaitem.component.thermos.new.name=Thermos
+metaitem.component.dewar_flask.casing.name=Dewar Flask Casing
+metaitem.component.dewar_flask.cap.name=Dewar Flask Cap
+metaitem.component.dewar_flask.casing_leached.name=Leached Dewar Flask Casing
+metaitem.component.dewar_flask.used.name=Used Dewar Flask
+metaitem.component.dewar_flask.new.name=Dewar Flask
 metaitem.lithium_bromide_dust.name=Lithium Bromide
 metaitem.titanium_dichloride_dust.name=Titanium Dichloride
 metaitem.nontoxic_polymoscovium_pentahalide_plate_curved.name=Nontoxic Polymoscovium Pentahalide Curved Plate

src/main/resources/assets/gregtechfoodoption/lang/ja_jp.lang

@@ -89,11 +89,11 @@ gregtech.material.gtfo_energized_coffee=エナジャイズドコーヒー
 
 metaitem.food.mineral_water.name=ミネラルウォーター
 metaitem.food.mineral_water.tooltip=チェックメイトだよ、無神論者。
-metaitem.component.thermos.casing.name=魔法瓶の容器
-metaitem.component.thermos.cap.name=魔法瓶の蓋
-metaitem.component.thermos.casing_leached.name=ひび割れた魔法瓶の容器
-metaitem.component.thermos.used.name=中古の魔法瓶
-metaitem.component.thermos.new.name=魔法瓶
+metaitem.component.dewar_flask.casing.name=魔法瓶の容器
+metaitem.component.dewar_flask.cap.name=魔法瓶の蓋
+metaitem.component.dewar_flask.casing_leached.name=ひび割れた魔法瓶の容器
+metaitem.component.dewar_flask.used.name=中古の魔法瓶
+metaitem.component.dewar_flask.new.name=魔法瓶
 metaitem.lithium_bromide_dust.name=臭化リチウム
 metaitem.titanium_dichloride_dust.name=二塩化チタニウム
 metaitem.nontoxic_polymoscovium_pentahalide_plate_curved.name=無毒性ポリモスコビウムペンタハライドの曲げ板

src/main/resources/assets/gregtechfoodoption/lang/zh_cn.lang

@@ -84,11 +84,11 @@ gregtech.material.gtfo_energized_coffee=提神咖啡
 
 metaitem.food.mineral_water.name=矿泉水
 metaitem.food.mineral_water.tooltip=认输吧，无神论者。
-metaitem.component.thermos.casing.name=膳魔师保温杯身
-metaitem.component.thermos.cap.name=膳魔师保温杯盖
-metaitem.component.thermos.casing_leached.name=使用过的膳魔师保温杯身
-metaitem.component.thermos.used.name=使用过的膳魔师保温杯
-metaitem.component.thermos.new.name=膳魔师保温杯
+metaitem.component.dewar_flask.casing.name=膳魔师保温杯身
+metaitem.component.dewar_flask.cap.name=膳魔师保温杯盖
+metaitem.component.dewar_flask.casing_leached.name=使用过的膳魔师保温杯身
+metaitem.component.dewar_flask.used.name=使用过的膳魔师保温杯
+metaitem.component.dewar_flask.new.name=膳魔师保温杯
 metaitem.lithium_bromide_dust.name=溴化锂
 metaitem.titanium_dichloride_dust.name=二氯化钛
 metaitem.nontoxic_polymoscovium_pentahalide_plate_curved.name=无毒多聚五氯化镆弯曲板