From 546c598bc489818d780e87f3732248170f92a23d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 13 Dec 2025 22:12:14 +0000 Subject: [PATCH] add item models for pills --- kubejs/assets/tfg/models/item/absorption_salvo.json | 6 ++++++ kubejs/assets/tfg/models/item/antipoison_pill.json | 6 ++++++ kubejs/assets/tfg/models/item/antipoison_tablet.json | 6 ++++++ kubejs/assets/tfg/models/item/fire_resistance_salvo.json | 6 ++++++ kubejs/assets/tfg/models/item/haste_pill.json | 6 ++++++ kubejs/assets/tfg/models/item/haste_tablet.json | 6 ++++++ kubejs/assets/tfg/models/item/instant_health_salvo.json | 6 ++++++ kubejs/assets/tfg/models/item/invisibility_salvo.json | 6 ++++++ kubejs/assets/tfg/models/item/luck_salvo.json | 6 ++++++ kubejs/assets/tfg/models/item/night_vision_pill.json | 6 ++++++ kubejs/assets/tfg/models/item/night_vision_tablet.json | 6 ++++++ kubejs/assets/tfg/models/item/poison_pill.json | 6 ++++++ kubejs/assets/tfg/models/item/poison_tablet.json | 6 ++++++ kubejs/assets/tfg/models/item/regeneration_pill.json | 6 ++++++ kubejs/assets/tfg/models/item/regeneration_tablet.json | 6 ++++++ kubejs/assets/tfg/models/item/resistance_salvo.json | 6 ++++++ kubejs/assets/tfg/models/item/slowness_pill.json | 6 ++++++ kubejs/assets/tfg/models/item/slowness_tablet.json | 6 ++++++ kubejs/assets/tfg/models/item/speed_pill.json | 6 ++++++ kubejs/assets/tfg/models/item/speed_tablet.json | 6 ++++++ kubejs/assets/tfg/models/item/water_breathing_pill.json | 6 ++++++ kubejs/assets/tfg/models/item/water_breathing_tablet.json | 6 ++++++ kubejs/assets/tfg/models/item/weakness_pill.json | 6 ++++++ kubejs/assets/tfg/models/item/weakness_tablet.json | 6 ++++++ kubejs/startup_scripts/gtceu/material_modification.js | 5 +++-- 25 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 kubejs/assets/tfg/models/item/absorption_salvo.json create mode 100644 kubejs/assets/tfg/models/item/antipoison_pill.json create mode 100644 kubejs/assets/tfg/models/item/antipoison_tablet.json create mode 100644 kubejs/assets/tfg/models/item/fire_resistance_salvo.json create mode 100644 kubejs/assets/tfg/models/item/haste_pill.json create mode 100644 kubejs/assets/tfg/models/item/haste_tablet.json create mode 100644 kubejs/assets/tfg/models/item/instant_health_salvo.json create mode 100644 kubejs/assets/tfg/models/item/invisibility_salvo.json create mode 100644 kubejs/assets/tfg/models/item/luck_salvo.json create mode 100644 kubejs/assets/tfg/models/item/night_vision_pill.json create mode 100644 kubejs/assets/tfg/models/item/night_vision_tablet.json create mode 100644 kubejs/assets/tfg/models/item/poison_pill.json create mode 100644 kubejs/assets/tfg/models/item/poison_tablet.json create mode 100644 kubejs/assets/tfg/models/item/regeneration_pill.json create mode 100644 kubejs/assets/tfg/models/item/regeneration_tablet.json create mode 100644 kubejs/assets/tfg/models/item/resistance_salvo.json create mode 100644 kubejs/assets/tfg/models/item/slowness_pill.json create mode 100644 kubejs/assets/tfg/models/item/slowness_tablet.json create mode 100644 kubejs/assets/tfg/models/item/speed_pill.json create mode 100644 kubejs/assets/tfg/models/item/speed_tablet.json create mode 100644 kubejs/assets/tfg/models/item/water_breathing_pill.json create mode 100644 kubejs/assets/tfg/models/item/water_breathing_tablet.json create mode 100644 kubejs/assets/tfg/models/item/weakness_pill.json create mode 100644 kubejs/assets/tfg/models/item/weakness_tablet.json diff --git a/kubejs/assets/tfg/models/item/absorption_salvo.json b/kubejs/assets/tfg/models/item/absorption_salvo.json new file mode 100644 index 000000000..44e8ed81a --- /dev/null +++ b/kubejs/assets/tfg/models/item/absorption_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/absorption_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/antipoison_pill.json b/kubejs/assets/tfg/models/item/antipoison_pill.json new file mode 100644 index 000000000..c45f964dd --- /dev/null +++ b/kubejs/assets/tfg/models/item/antipoison_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/antipoison_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/antipoison_tablet.json b/kubejs/assets/tfg/models/item/antipoison_tablet.json new file mode 100644 index 000000000..41b9bbd3c --- /dev/null +++ b/kubejs/assets/tfg/models/item/antipoison_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/antipoison_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/fire_resistance_salvo.json b/kubejs/assets/tfg/models/item/fire_resistance_salvo.json new file mode 100644 index 000000000..c94e842f3 --- /dev/null +++ b/kubejs/assets/tfg/models/item/fire_resistance_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/fire_resistance_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/haste_pill.json b/kubejs/assets/tfg/models/item/haste_pill.json new file mode 100644 index 000000000..78f50953e --- /dev/null +++ b/kubejs/assets/tfg/models/item/haste_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/haste_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/haste_tablet.json b/kubejs/assets/tfg/models/item/haste_tablet.json new file mode 100644 index 000000000..f9c391d9f --- /dev/null +++ b/kubejs/assets/tfg/models/item/haste_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/haste_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/instant_health_salvo.json b/kubejs/assets/tfg/models/item/instant_health_salvo.json new file mode 100644 index 000000000..ce53f77de --- /dev/null +++ b/kubejs/assets/tfg/models/item/instant_health_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/instant_health_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/invisibility_salvo.json b/kubejs/assets/tfg/models/item/invisibility_salvo.json new file mode 100644 index 000000000..21b5ce0d6 --- /dev/null +++ b/kubejs/assets/tfg/models/item/invisibility_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/invisibility_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/luck_salvo.json b/kubejs/assets/tfg/models/item/luck_salvo.json new file mode 100644 index 000000000..600e33637 --- /dev/null +++ b/kubejs/assets/tfg/models/item/luck_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/luck_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/night_vision_pill.json b/kubejs/assets/tfg/models/item/night_vision_pill.json new file mode 100644 index 000000000..9326a59eb --- /dev/null +++ b/kubejs/assets/tfg/models/item/night_vision_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/night_vision_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/night_vision_tablet.json b/kubejs/assets/tfg/models/item/night_vision_tablet.json new file mode 100644 index 000000000..b1cd8fd85 --- /dev/null +++ b/kubejs/assets/tfg/models/item/night_vision_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/night_vision_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/poison_pill.json b/kubejs/assets/tfg/models/item/poison_pill.json new file mode 100644 index 000000000..541236b03 --- /dev/null +++ b/kubejs/assets/tfg/models/item/poison_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/poison_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/poison_tablet.json b/kubejs/assets/tfg/models/item/poison_tablet.json new file mode 100644 index 000000000..5e13ef48a --- /dev/null +++ b/kubejs/assets/tfg/models/item/poison_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/poison_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/regeneration_pill.json b/kubejs/assets/tfg/models/item/regeneration_pill.json new file mode 100644 index 000000000..5a4e8026e --- /dev/null +++ b/kubejs/assets/tfg/models/item/regeneration_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/regeneration_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/regeneration_tablet.json b/kubejs/assets/tfg/models/item/regeneration_tablet.json new file mode 100644 index 000000000..27fb807c7 --- /dev/null +++ b/kubejs/assets/tfg/models/item/regeneration_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/regeneration_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/resistance_salvo.json b/kubejs/assets/tfg/models/item/resistance_salvo.json new file mode 100644 index 000000000..2b4bba5a4 --- /dev/null +++ b/kubejs/assets/tfg/models/item/resistance_salvo.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/resistance_salvo" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/slowness_pill.json b/kubejs/assets/tfg/models/item/slowness_pill.json new file mode 100644 index 000000000..5b66f6a7b --- /dev/null +++ b/kubejs/assets/tfg/models/item/slowness_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/slowness_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/slowness_tablet.json b/kubejs/assets/tfg/models/item/slowness_tablet.json new file mode 100644 index 000000000..61af42074 --- /dev/null +++ b/kubejs/assets/tfg/models/item/slowness_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/slowness_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/speed_pill.json b/kubejs/assets/tfg/models/item/speed_pill.json new file mode 100644 index 000000000..faa19459c --- /dev/null +++ b/kubejs/assets/tfg/models/item/speed_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/speed_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/speed_tablet.json b/kubejs/assets/tfg/models/item/speed_tablet.json new file mode 100644 index 000000000..881364bd1 --- /dev/null +++ b/kubejs/assets/tfg/models/item/speed_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/speed_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/water_breathing_pill.json b/kubejs/assets/tfg/models/item/water_breathing_pill.json new file mode 100644 index 000000000..5d8919992 --- /dev/null +++ b/kubejs/assets/tfg/models/item/water_breathing_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/water_breathing_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/water_breathing_tablet.json b/kubejs/assets/tfg/models/item/water_breathing_tablet.json new file mode 100644 index 000000000..0417d1a21 --- /dev/null +++ b/kubejs/assets/tfg/models/item/water_breathing_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/water_breathing_tablet" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/weakness_pill.json b/kubejs/assets/tfg/models/item/weakness_pill.json new file mode 100644 index 000000000..c39e145a4 --- /dev/null +++ b/kubejs/assets/tfg/models/item/weakness_pill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/weakness_pill" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/weakness_tablet.json b/kubejs/assets/tfg/models/item/weakness_tablet.json new file mode 100644 index 000000000..811a696a2 --- /dev/null +++ b/kubejs/assets/tfg/models/item/weakness_tablet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/weakness_tablet" + } +} \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index 3ec698b25..0763461fa 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -344,13 +344,14 @@ const registerGTCEuMaterialModification = (event) => { // Ostrum fluid pipe - same flow rate as titanium, higher temp range GTMaterials.get('ostrum').setProperty(PropertyKey.FLUID_PIPE, new $FLUID_PIPE_PROPERTY(3700, 150, true, false, true, false)); - // Add some hazards back + // int is how fast the condition progresses (default 1.0) + // bool is whether or not the condition applies to anything made with the material, other than dusts (default false) GTMaterials.Realgar.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.ARSENICOSIS, 1, false)); GTMaterials.Cobaltite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.ARSENICOSIS, 1, false)); GTMaterials.Galena.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.INHALATION, GTMedicalConditions.WEAK_POISON, 1, false)); GTMaterials.Chromite.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.SKIN_CONTACT, GTMedicalConditions.IRRITANT, 1, false)); GTMaterials.Thorium.setProperty(PropertyKey.HAZARD, new $HAZARD_PROPERTY($HAZARD_PROPERTY.HazardTrigger.ANY, GTMedicalConditions.CARCINOGEN, 1, true)); - + // This contains hazardous elements so GT tags it as hazardous automatically GTMaterials.get('ostrum').getProperties().removeProperty(PropertyKey.HAZARD); GTMaterials.get('ostrum_iodide').getProperties().removeProperty(PropertyKey.HAZARD);