Add Falkory's textures (#33)

* apiculture textures * Apiculture 2/2 * A bunch of misc textures * Slight improvement to the Portable Analyzer texture * some misc textures * Electron tubes * texture changes (thanks reda) * Cherry texture * Tweak bronze colors to be less similar to AllTheModium and and more like original Bronze * Redo several textures to be more like the originals * Fix Alveary textures --------- Co-authored-by: Falkor220 <[email protected]>
thedarkcolour · Nov 27, 2024 · f8b8230 · f8b8230
1 parent 0eb2305
commit f8b8230
Show file tree

Hide file tree

Showing 119 changed files with 109 additions and 3 deletions.
diff --git a/src/main/resources/assets/forestry/models/item/wrench.json b/src/main/resources/assets/forestry/models/item/wrench.json
@@ -1,5 +1,5 @@
 {
-    "parent": "item/generated",
+    "parent": "item/handheld",
     "textures": {
       "layer0": "forestry:item/wrench"
     }

diff --git a/src/main/resources/assets/forestry/textures/block/analyzer_pedestal.png b/src/main/resources/assets/forestry/textures/block/analyzer_pedestal.png
diff --git a/src/main/resources/assets/forestry/textures/block/analyzer_tower1.png b/src/main/resources/assets/forestry/textures/block/analyzer_tower1.png
diff --git a/src/main/resources/assets/forestry/textures/block/analyzer_tower2.png b/src/main/resources/assets/forestry/textures/block/analyzer_tower2.png
diff --git a/src/main/resources/assets/forestry/textures/block/apiaristchest.png b/src/main/resources/assets/forestry/textures/block/apiaristchest.png
diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.off.png b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.off.png
diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.on.png b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.on.png
diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.on.png.mcmeta b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.fan.on.png.mcmeta
@@ -0,0 +1,15 @@
+{
+  "animation": {
+    "frames": [
+      {
+        "index": 0,
+        "time": 2
+      },
+      {
+        "index": 1,
+        "time": 2
+      }
+    ],
+    "frametime": 1
+  }
+}
diff --git a/...main/resources/assets/forestry/textures/block/apiculture/alveary.heater.off.png b/...main/resources/assets/forestry/textures/block/apiculture/alveary.heater.off.png
diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.on.png b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.on.png
diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.on.png.mcmeta b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.heater.on.png.mcmeta
@@ -0,0 +1,15 @@
+{
+  "animation": {
+    "frames": [
+      {
+        "index": 0,
+        "time": 10
+      },
+      {
+        "index": 1,
+        "time": 10
+      }
+    ],
+    "frametime": 1
+  }
+}
diff --git a/...ain/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.off.png b/...ain/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.off.png
diff --git a/...main/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.on.png b/...main/resources/assets/forestry/textures/block/apiculture/alveary.swarmer.on.png
diff --git a/src/main/resources/assets/forestry/textures/block/apiculture/alveary.valve.png b/src/main/resources/assets/forestry/textures/block/apiculture/alveary.valve.png
diff --git a/src/main/resources/assets/forestry/textures/block/bee_combs.0.png b/src/main/resources/assets/forestry/textures/block/bee_combs.0.png
diff --git a/src/main/resources/assets/forestry/textures/block/bee_combs.1.png b/src/main/resources/assets/forestry/textures/block/bee_combs.1.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/desert.side.png b/src/main/resources/assets/forestry/textures/block/beehives/desert.side.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/desert.top.png b/src/main/resources/assets/forestry/textures/block/beehives/desert.top.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/end.side.png b/src/main/resources/assets/forestry/textures/block/beehives/end.side.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/end.top.png b/src/main/resources/assets/forestry/textures/block/beehives/end.top.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/forest.side.png b/src/main/resources/assets/forestry/textures/block/beehives/forest.side.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/forest.top.png b/src/main/resources/assets/forestry/textures/block/beehives/forest.top.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/jungle.side.png b/src/main/resources/assets/forestry/textures/block/beehives/jungle.side.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/jungle.top.png b/src/main/resources/assets/forestry/textures/block/beehives/jungle.top.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/meadows.side.png b/src/main/resources/assets/forestry/textures/block/beehives/meadows.side.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/meadows.top.png b/src/main/resources/assets/forestry/textures/block/beehives/meadows.top.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/snow.side.png b/src/main/resources/assets/forestry/textures/block/beehives/snow.side.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/snow.top.png b/src/main/resources/assets/forestry/textures/block/beehives/snow.top.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/swamp.side.png b/src/main/resources/assets/forestry/textures/block/beehives/swamp.side.png
diff --git a/src/main/resources/assets/forestry/textures/block/beehives/swamp.top.png b/src/main/resources/assets/forestry/textures/block/beehives/swamp.top.png
diff --git a/src/main/resources/assets/forestry/textures/block/lepichest.png b/src/main/resources/assets/forestry/textures/block/lepichest.png
diff --git a/src/main/resources/assets/forestry/textures/block/storage/apatite.png b/src/main/resources/assets/forestry/textures/block/storage/apatite.png
diff --git a/src/main/resources/assets/forestry/textures/block/storage/bronze.png b/src/main/resources/assets/forestry/textures/block/storage/bronze.png
diff --git a/src/main/resources/assets/forestry/textures/block/storage/copper.png b/src/main/resources/assets/forestry/textures/block/storage/copper.png
diff --git a/src/main/resources/assets/forestry/textures/block/storage/tin.png b/src/main/resources/assets/forestry/textures/block/storage/tin.png
diff --git a/src/main/resources/assets/forestry/textures/block/worktable.0.png b/src/main/resources/assets/forestry/textures/block/worktable.0.png
diff --git a/src/main/resources/assets/forestry/textures/block/worktable.1.png b/src/main/resources/assets/forestry/textures/block/worktable.1.png
diff --git a/src/main/resources/assets/forestry/textures/block/worktable.2.png b/src/main/resources/assets/forestry/textures/block/worktable.2.png
diff --git a/src/main/resources/assets/forestry/textures/block/worktable.3.png b/src/main/resources/assets/forestry/textures/block/worktable.3.png
diff --git a/src/main/resources/assets/forestry/textures/block/worktable.4.png b/src/main/resources/assets/forestry/textures/block/worktable.4.png
diff --git a/src/main/resources/assets/forestry/textures/forestry/atlas/gui/analyzer/serum.png b/src/main/resources/assets/forestry/textures/forestry/atlas/gui/analyzer/serum.png
diff --git a/src/main/resources/assets/forestry/textures/gui/analyzer_screen.png b/src/main/resources/assets/forestry/textures/gui/analyzer_screen.png
diff --git a/src/main/resources/assets/forestry/textures/item/apatite.png b/src/main/resources/assets/forestry/textures/item/apatite.png
diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_armor_1.png b/src/main/resources/assets/forestry/textures/item/apiarist_armor_1.png
diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_armor_2.png b/src/main/resources/assets/forestry/textures/item/apiarist_armor_2.png
diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_boots.png b/src/main/resources/assets/forestry/textures/item/apiarist_boots.png
diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_chest.png b/src/main/resources/assets/forestry/textures/item/apiarist_chest.png
diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_helmet.png b/src/main/resources/assets/forestry/textures/item/apiarist_helmet.png
diff --git a/src/main/resources/assets/forestry/textures/item/apiarist_legs.png b/src/main/resources/assets/forestry/textures/item/apiarist_legs.png
diff --git a/src/main/resources/assets/forestry/textures/item/bee_comb.png b/src/main/resources/assets/forestry/textures/item/bee_comb.png
diff --git a/src/main/resources/assets/forestry/textures/item/bee_combs.0.png b/src/main/resources/assets/forestry/textures/item/bee_combs.0.png
diff --git a/src/main/resources/assets/forestry/textures/item/bee_combs.1.png b/src/main/resources/assets/forestry/textures/item/bee_combs.1.png
diff --git a/src/main/resources/assets/forestry/textures/item/beealyzer.png b/src/main/resources/assets/forestry/textures/item/beealyzer.png
diff --git a/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body.png b/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body.png
diff --git a/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body2.png b/src/main/resources/assets/forestry/textures/item/bees/default/larvae.body2.png
diff --git a/src/main/resources/assets/forestry/textures/item/bees/default/larvae.outline.png b/src/main/resources/assets/forestry/textures/item/bees/default/larvae.outline.png
diff --git a/src/main/resources/assets/forestry/textures/item/beeswax.png b/src/main/resources/assets/forestry/textures/item/beeswax.png
diff --git a/src/main/resources/assets/forestry/textures/item/broken_bronze_pickaxe.png b/src/main/resources/assets/forestry/textures/item/broken_bronze_pickaxe.png
diff --git a/src/main/resources/assets/forestry/textures/item/broken_bronze_shovel.png b/src/main/resources/assets/forestry/textures/item/broken_bronze_shovel.png
diff --git a/src/main/resources/assets/forestry/textures/item/bronze_pickaxe.png b/src/main/resources/assets/forestry/textures/item/bronze_pickaxe.png
diff --git a/src/main/resources/assets/forestry/textures/item/bronze_shovel.png b/src/main/resources/assets/forestry/textures/item/bronze_shovel.png
diff --git a/src/main/resources/assets/forestry/textures/item/cart.apiary.png b/src/main/resources/assets/forestry/textures/item/cart.apiary.png
diff --git a/src/main/resources/assets/forestry/textures/item/cart.beehouse.png b/src/main/resources/assets/forestry/textures/item/cart.beehouse.png
diff --git a/src/main/resources/assets/forestry/textures/item/carton.png b/src/main/resources/assets/forestry/textures/item/carton.png
diff --git a/src/main/resources/assets/forestry/textures/item/catalogue.png b/src/main/resources/assets/forestry/textures/item/catalogue.png
diff --git a/src/main/resources/assets/forestry/textures/item/caterpillar.body.png b/src/main/resources/assets/forestry/textures/item/caterpillar.body.png
diff --git a/src/main/resources/assets/forestry/textures/item/caterpillar.body.png.mcmeta b/src/main/resources/assets/forestry/textures/item/caterpillar.body.png.mcmeta
@@ -1 +1,39 @@
-{"animation":{"frametime":1,"frames":[{"index":0,"time":7},{"index":1,"time":3},{"index":0,"time":9},{"index":1,"time":2},{"index":0,"time":5},{"index":1,"time":2}]}}
+{
+  "animation": {
+    "frames": [
+      {
+        "index": 0,
+        "time": 32
+      },
+      {
+        "index": 1,
+        "time": 4
+      },
+      {
+        "index": 2,
+        "time": 4
+      },
+      {
+        "index": 3,
+        "time": 4
+      },
+      {
+        "index": 4,
+        "time": 4
+      },
+      {
+        "index": 5,
+        "time": 4
+      },
+      {
+        "index": 6,
+        "time": 4
+      },
+      {
+        "index": 7,
+        "time": 4
+      }
+    ],
+    "frametime": 1
+  }
+}
diff --git a/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png b/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png
diff --git a/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png.mcmeta b/src/main/resources/assets/forestry/textures/item/caterpillar.body2.png.mcmeta
@@ -1 +1,39 @@
-{"animation":{"frametime":1,"frames":[{"index":0,"time":7},{"index":1,"time":3},{"index":0,"time":9},{"index":1,"time":2},{"index":0,"time":5},{"index":1,"time":2}]}}
+{
+  "animation": {
+    "frames": [
+      {
+        "index": 0,
+        "time": 32
+      },
+      {
+        "index": 1,
+        "time": 4
+      },
+      {
+        "index": 2,
+        "time": 4
+      },
+      {
+        "index": 3,
+        "time": 4
+      },
+      {
+        "index": 4,
+        "time": 4
+      },
+      {
+        "index": 5,
+        "time": 4
+      },
+      {
+        "index": 6,
+        "time": 4
+      },
+      {
+        "index": 7,
+        "time": 4
+      }
+    ],
+    "frametime": 1
+  }
+}
diff --git a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_early.png b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_early.png
diff --git a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_late.png b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_late.png
diff --git a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_middle.png b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_middle.png
diff --git a/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_silk_late.png b/src/main/resources/assets/forestry/textures/item/cocoons/cocoon_silk_late.png
diff --git a/src/main/resources/assets/forestry/textures/item/crate-filled.png b/src/main/resources/assets/forestry/textures/item/crate-filled.png
diff --git a/src/main/resources/assets/forestry/textures/item/crate.png b/src/main/resources/assets/forestry/textures/item/crate.png
diff --git a/src/main/resources/assets/forestry/textures/item/fertilizer_bio.png b/src/main/resources/assets/forestry/textures/item/fertilizer_bio.png
diff --git a/src/main/resources/assets/forestry/textures/item/fertilizer_compound.png b/src/main/resources/assets/forestry/textures/item/fertilizer_compound.png
diff --git a/src/main/resources/assets/forestry/textures/item/foresters_manual.png b/src/main/resources/assets/forestry/textures/item/foresters_manual.png
diff --git a/src/main/resources/assets/forestry/textures/item/frame_impregnated.png b/src/main/resources/assets/forestry/textures/item/frame_impregnated.png
diff --git a/src/main/resources/assets/forestry/textures/item/frame_proven.png b/src/main/resources/assets/forestry/textures/item/frame_proven.png
diff --git a/src/main/resources/assets/forestry/textures/item/frame_untreated.png b/src/main/resources/assets/forestry/textures/item/frame_untreated.png
diff --git a/src/main/resources/assets/forestry/textures/item/fruits/cherry.png b/src/main/resources/assets/forestry/textures/item/fruits/cherry.png
diff --git a/src/main/resources/assets/forestry/textures/item/gear_bronze.png b/src/main/resources/assets/forestry/textures/item/gear_bronze.png
diff --git a/src/main/resources/assets/forestry/textures/item/gear_copper.png b/src/main/resources/assets/forestry/textures/item/gear_copper.png
diff --git a/src/main/resources/assets/forestry/textures/item/gear_tin.png b/src/main/resources/assets/forestry/textures/item/gear_tin.png
diff --git a/src/main/resources/assets/forestry/textures/item/imprinter.png b/src/main/resources/assets/forestry/textures/item/imprinter.png
diff --git a/src/main/resources/assets/forestry/textures/item/ingot_bronze.png b/src/main/resources/assets/forestry/textures/item/ingot_bronze.png
diff --git a/src/main/resources/assets/forestry/textures/item/ingot_copper.png b/src/main/resources/assets/forestry/textures/item/ingot_copper.png
diff --git a/src/main/resources/assets/forestry/textures/item/ingot_tin.png b/src/main/resources/assets/forestry/textures/item/ingot_tin.png
diff --git a/src/main/resources/assets/forestry/textures/item/kit_pickaxe.png b/src/main/resources/assets/forestry/textures/item/kit_pickaxe.png
diff --git a/src/main/resources/assets/forestry/textures/item/kit_shovel.png b/src/main/resources/assets/forestry/textures/item/kit_shovel.png
diff --git a/src/main/resources/assets/forestry/textures/item/liquids/glass.bottle.png b/src/main/resources/assets/forestry/textures/item/liquids/glass.bottle.png
diff --git a/src/main/resources/assets/forestry/textures/item/liquids/glass.contents.png b/src/main/resources/assets/forestry/textures/item/liquids/glass.contents.png
diff --git a/src/main/resources/assets/forestry/textures/item/liquids/jar.bottle.png b/src/main/resources/assets/forestry/textures/item/liquids/jar.bottle.png
diff --git a/src/main/resources/assets/forestry/textures/item/liquids/jar.contents.png b/src/main/resources/assets/forestry/textures/item/liquids/jar.contents.png
diff --git a/src/main/resources/assets/forestry/textures/item/mail/letter.0.emptied.png b/src/main/resources/assets/forestry/textures/item/mail/letter.0.emptied.png
diff --git a/src/main/resources/assets/forestry/textures/item/mail/letter.0.fresh.png b/src/main/resources/assets/forestry/textures/item/mail/letter.0.fresh.png
diff --git a/src/main/resources/assets/forestry/textures/item/mail/letter.0.opened.png b/src/main/resources/assets/forestry/textures/item/mail/letter.0.opened.png
diff --git a/src/main/resources/assets/forestry/textures/item/mail/letter.0.stamped.png b/src/main/resources/assets/forestry/textures/item/mail/letter.0.stamped.png
diff --git a/src/main/resources/assets/forestry/textures/item/mulch.png b/src/main/resources/assets/forestry/textures/item/mulch.png
diff --git a/src/main/resources/assets/forestry/textures/item/normal_backpack.png b/src/main/resources/assets/forestry/textures/item/normal_backpack.png
diff --git a/src/main/resources/assets/forestry/textures/item/normal_backpack_outline.png b/src/main/resources/assets/forestry/textures/item/normal_backpack_outline.png
diff --git a/src/main/resources/assets/forestry/textures/item/pipette.0.png b/src/main/resources/assets/forestry/textures/item/pipette.0.png
diff --git a/src/main/resources/assets/forestry/textures/item/pipette.1.png b/src/main/resources/assets/forestry/textures/item/pipette.1.png
diff --git a/src/main/resources/assets/forestry/textures/item/pollen.0.png b/src/main/resources/assets/forestry/textures/item/pollen.0.png
diff --git a/src/main/resources/assets/forestry/textures/item/pollen.1.png b/src/main/resources/assets/forestry/textures/item/pollen.1.png
diff --git a/src/main/resources/assets/forestry/textures/item/portable_alyzer.png b/src/main/resources/assets/forestry/textures/item/portable_alyzer.png
diff --git a/src/main/resources/assets/forestry/textures/item/propolis.0.png b/src/main/resources/assets/forestry/textures/item/propolis.0.png
diff --git a/src/main/resources/assets/forestry/textures/item/pulsating_dust.png b/src/main/resources/assets/forestry/textures/item/pulsating_dust.png
diff --git a/src/main/resources/assets/forestry/textures/item/refractory_wax.png b/src/main/resources/assets/forestry/textures/item/refractory_wax.png
diff --git a/src/main/resources/assets/forestry/textures/item/royal_jelly.png b/src/main/resources/assets/forestry/textures/item/royal_jelly.png
diff --git a/src/main/resources/assets/forestry/textures/item/scoop.png b/src/main/resources/assets/forestry/textures/item/scoop.png
diff --git a/src/main/resources/assets/forestry/textures/item/smoker.png b/src/main/resources/assets/forestry/textures/item/smoker.png
diff --git a/src/main/resources/assets/forestry/textures/item/thermionic_tubes.0.png b/src/main/resources/assets/forestry/textures/item/thermionic_tubes.0.png
diff --git a/src/main/resources/assets/forestry/textures/item/wax_cast.png b/src/main/resources/assets/forestry/textures/item/wax_cast.png
diff --git a/src/main/resources/assets/forestry/textures/item/wood_pulp.png b/src/main/resources/assets/forestry/textures/item/wood_pulp.png
diff --git a/src/main/resources/assets/forestry/textures/item/woven_backpack.png b/src/main/resources/assets/forestry/textures/item/woven_backpack.png
diff --git a/src/main/resources/assets/forestry/textures/item/woven_backpack_outline.png b/src/main/resources/assets/forestry/textures/item/woven_backpack_outline.png
diff --git a/src/main/resources/assets/forestry/textures/item/wrench.png b/src/main/resources/assets/forestry/textures/item/wrench.png