diff --git a/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor.json b/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor.json index 448334a7f..14b793bf6 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor.json +++ b/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor.json @@ -1,6 +1,7 @@ { "credit": "Made with Blockbench", "textures": { + "3": "actuallyadditions:block/base_texture_arrow", "base": "actuallyadditions:block/base_texture", "particle": "actuallyadditions:block/atomic_reconstructor_front", "front": "actuallyadditions:block/atomic_reconstructor_front", @@ -141,7 +142,7 @@ "faces": { "north": {"uv": [1, 1, 15, 15], "texture": "#base"}, "east": {"uv": [1, 1, 15, 2], "rotation": 270, "texture": "#base"}, - "south": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#3"}, "west": {"uv": [1, 1, 15, 2], "rotation": 90, "texture": "#base"}, "up": {"uv": [1, 1, 15, 2], "texture": "#base"}, "down": {"uv": [1, 1, 15, 2], "texture": "#base"} @@ -151,7 +152,7 @@ "from": [1, 1, 1], "to": [15, 15, 2], "faces": { - "north": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "north": {"uv": [1, 1, 15, 15], "texture": "#3"}, "east": {"uv": [1, 14, 15, 15], "rotation": 270, "texture": "#base"}, "south": {"uv": [1, 1, 15, 15], "texture": "#base"}, "west": {"uv": [1, 14, 15, 15], "rotation": 90, "texture": "#base"}, diff --git a/src/main/resources/assets/actuallyadditions/models/block/bio_reactor.json b/src/main/resources/assets/actuallyadditions/models/block/bio_reactor.json index 8897ec856..68f6f455d 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/bio_reactor.json +++ b/src/main/resources/assets/actuallyadditions/models/block/bio_reactor.json @@ -3,6 +3,7 @@ "textures": { "3": "actuallyadditions:block/base_texture_small", "4": "actuallyadditions:block/bioreactor_top_animation", + "5": "actuallyadditions:block/base_texture_vent", "base": "actuallyadditions:block/base_texture", "particle": "actuallyadditions:block/bioreactor_side", "side": "actuallyadditions:block/bioreactor_side", @@ -232,7 +233,7 @@ "faces": { "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, "east": {"uv": [1, 1, 2, 16], "texture": "#base"}, - "south": {"uv": [1, 1, 15, 16], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#5"}, "west": {"uv": [14, 1, 15, 16], "texture": "#base"}, "up": {"uv": [1, 14, 15, 15], "texture": "#base"}, "down": {"uv": [1, 14, 15, 15], "texture": "#base", "cullface": "down"} diff --git a/src/main/resources/assets/actuallyadditions/models/block/farmer.json b/src/main/resources/assets/actuallyadditions/models/block/farmer.json index a638d5fbb..3f3c4b4da 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/farmer.json +++ b/src/main/resources/assets/actuallyadditions/models/block/farmer.json @@ -5,9 +5,9 @@ "5": "actuallyadditions:block/farmer_top_animation", "7": "actuallyadditions:block/farmer_front_animation", "8": "actuallyadditions:block/base_texture_back", + "particle": "actuallyadditions:block/base_texture_small", "base": "actuallyadditions:block/base_texture", - "side": "actuallyadditions:block/farmer_side", - "particle": "actuallyadditions:block/base_texture_small" + "side": "actuallyadditions:block/base_texture_vent" }, "elements": [ { @@ -223,7 +223,7 @@ "to": [2, 15, 14], "faces": { "east": {"uv": [0, 0, 12, 15], "texture": "#missing"}, - "west": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "west": {"uv": [2, 1, 14, 16], "texture": "#base"}, "up": {"uv": [1, 2, 2, 14], "texture": "#base"}, "down": {"uv": [14, 2, 15, 14], "texture": "#base", "cullface": "down"} } diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay.json index c2c8eef9d..0430aa331 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_advanced.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_advanced.json index afc4b2497..68d9735fb 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_advanced.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_advanced.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_extreme.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_extreme.json index 397aa7849..e450a22bd 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_extreme.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_extreme.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_fluids.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_fluids.json index 955012da4..965e0625f 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_fluids.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_fluids.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item.json index f386964c1..27503bb74 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item_advanced.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item_advanced.json index 79851cf54..48e980ae1 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item_advanced.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item_advanced.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/leaf_generator.json b/src/main/resources/assets/actuallyadditions/models/block/leaf_generator.json index ae63906b8..3b5a1800c 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/leaf_generator.json +++ b/src/main/resources/assets/actuallyadditions/models/block/leaf_generator.json @@ -3,6 +3,7 @@ "textures": { "3": "actuallyadditions:block/base_texture_large", "4": "actuallyadditions:block/leaf_gen_animated", + "5": "actuallyadditions:block/base_texture_vent", "base": "actuallyadditions:block/base_texture", "front": "actuallyadditions:block/base_texture_back", "particle": "actuallyadditions:block/leaf_gen_front", @@ -149,7 +150,7 @@ "from": [14, 0, 2], "to": [15, 15, 14], "faces": { - "east": {"uv": [2, 1, 14, 16], "texture": "#base"}, + "east": {"uv": [2, 1, 14, 16], "texture": "#5"}, "west": {"uv": [0, 0, 12, 15], "texture": "#base"}, "up": {"uv": [1, 2, 2, 14], "texture": "#base"}, "down": {"uv": [2, 1, 14, 2], "rotation": 270, "texture": "#base", "cullface": "down"} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/farmer_side.png b/src/main/resources/assets/actuallyadditions/textures/block/farmer_side.png deleted file mode 100644 index 899336d3a..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/farmer_side.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_black_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_black_on.png index eb3d53aea..6540bf488 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_black_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_black_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on.png index ec8a80fdf..13fb48689 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_on.png index 7dbab461e..d1363a517 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_on.png index bb4de8abc..af5a5c261 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_on.png index 0429bbb70..c61546e71 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on.png index 9c558dc95..849005d19 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on.png index 094c04b6a..b2a262089 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on.png index 662aa312f..cbf50c60e 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_on.png index 804a20c2b..8fc151815 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta_on.png index a56bc3947..ac479108c 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_orange_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_orange_on.png index f3d1a2562..b8a473b4c 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_orange_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_orange_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_pink_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_pink_on.png index ba44630c7..351f2e032 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_pink_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_pink_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_on.png index b035b44dd..2d0ede800 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_red_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_red_on.png index 46bbe0f01..de87e833f 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_red_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_red_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_white_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_white_on.png index 16f980371..10a1af2ef 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_white_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_white_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow_on.png index 3f3026df0..f8deb714b 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow_on.png and b/src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow_on.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantomface_breaker.png b/src/main/resources/assets/actuallyadditions/textures/block/phantomface_breaker.png index 291574836..ebe16b1b3 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/phantomface_breaker.png and b/src/main/resources/assets/actuallyadditions/textures/block/phantomface_breaker.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantomface_placer.png b/src/main/resources/assets/actuallyadditions/textures/block/phantomface_placer.png index 34ce28a63..e4f1988d5 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/phantomface_placer.png and b/src/main/resources/assets/actuallyadditions/textures/block/phantomface_placer.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_black.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_black.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_black.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_black.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_blue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_blue.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_blue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_brown.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_brown.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_brown.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_cyan.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_cyan.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_gray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_gray.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_gray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_green.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_green.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_green.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_green.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_light_blue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_light_blue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_light_gray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_light_gray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_lime.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_lime.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_lime.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_magenta.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_magenta.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_orange.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_orange.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_orange.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_orange.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_pink.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_pink.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_pink.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_pink.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_purple.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_purple.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_purple.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_red.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_red.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_red.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_red.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_white.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_white.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_white.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_white.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_yellow.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_yellow.png