From 44e34b26c16455b02e9df860574fb417b054a95f Mon Sep 17 00:00:00 2001 From: bazke Date: Thu, 7 Nov 2024 20:27:38 +0100 Subject: [PATCH] rename launchpad to jumppad --- .../{launchpad.json => jumppad.json} | 408 +++++++++--------- .../resources/assets/ltextras/lang/en_ud.json | 2 +- .../resources/assets/ltextras/lang/en_us.json | 2 +- .../assets/ltextras/models/block/jumppad.json | 9 + .../models/block/jumppad_nohoriz.json | 9 + .../ltextras/models/block/launchpad.json | 9 - .../models/block/launchpad_nohoriz.json | 9 - .../assets/ltextras/models/item/jumppad.json | 3 + .../ltextras/models/item/launchpad.json | 3 - .../blocks/{launchpad.json => jumppad.json} | 4 +- .../com/lovetropics/extras/ExtraBlocks.java | 27 +- ...{LaunchpadBlock.java => JumppadBlock.java} | 7 +- ...aunchpad_bottom.png => jumppad_bottom.png} | Bin .../{launchpad_side.png => jumppad_side.png} | Bin .../{launchpad_top.png => jumppad_top.png} | Bin ...op_nohoriz.png => jumppad_top_nohoriz.png} | Bin 16 files changed, 245 insertions(+), 247 deletions(-) rename src/generated/resources/assets/ltextras/blockstates/{launchpad.json => jumppad.json} (58%) create mode 100644 src/generated/resources/assets/ltextras/models/block/jumppad.json create mode 100644 src/generated/resources/assets/ltextras/models/block/jumppad_nohoriz.json delete mode 100644 src/generated/resources/assets/ltextras/models/block/launchpad.json delete mode 100644 src/generated/resources/assets/ltextras/models/block/launchpad_nohoriz.json create mode 100644 src/generated/resources/assets/ltextras/models/item/jumppad.json delete mode 100644 src/generated/resources/assets/ltextras/models/item/launchpad.json rename src/generated/resources/data/ltextras/loot_table/blocks/{launchpad.json => jumppad.json} (77%) rename src/main/java/com/lovetropics/extras/block/{LaunchpadBlock.java => JumppadBlock.java} (91%) rename src/main/resources/assets/ltextras/textures/block/{launchpad_bottom.png => jumppad_bottom.png} (100%) rename src/main/resources/assets/ltextras/textures/block/{launchpad_side.png => jumppad_side.png} (100%) rename src/main/resources/assets/ltextras/textures/block/{launchpad_top.png => jumppad_top.png} (100%) rename src/main/resources/assets/ltextras/textures/block/{launchpad_top_nohoriz.png => jumppad_top_nohoriz.png} (100%) diff --git a/src/generated/resources/assets/ltextras/blockstates/launchpad.json b/src/generated/resources/assets/ltextras/blockstates/jumppad.json similarity index 58% rename from src/generated/resources/assets/ltextras/blockstates/launchpad.json rename to src/generated/resources/assets/ltextras/blockstates/jumppad.json index 9e8b49aa..6e1aef0f 100644 --- a/src/generated/resources/assets/ltextras/blockstates/launchpad.json +++ b/src/generated/resources/assets/ltextras/blockstates/jumppad.json @@ -1,768 +1,768 @@ { "variants": { "facing=east,horizontal_power=0": { - "model": "ltextras:block/launchpad_nohoriz", + "model": "ltextras:block/jumppad_nohoriz", "y": 90 }, "facing=east,horizontal_power=1": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=10": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=11": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=12": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=13": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=14": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=15": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=16": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=17": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=18": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=19": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=2": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=20": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=21": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=22": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=23": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=24": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=25": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=26": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=27": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=28": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=29": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=3": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=30": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=31": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=32": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=33": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=34": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=35": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=36": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=37": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=38": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=39": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=4": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=40": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=41": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=42": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=43": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=44": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=45": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=46": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=47": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=48": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=49": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=5": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=50": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=6": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=7": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=8": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=east,horizontal_power=9": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 90 }, "facing=north,horizontal_power=0": { - "model": "ltextras:block/launchpad_nohoriz" + "model": "ltextras:block/jumppad_nohoriz" }, "facing=north,horizontal_power=1": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=10": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=11": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=12": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=13": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=14": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=15": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=16": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=17": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=18": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=19": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=2": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=20": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=21": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=22": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=23": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=24": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=25": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=26": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=27": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=28": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=29": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=3": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=30": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=31": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=32": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=33": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=34": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=35": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=36": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=37": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=38": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=39": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=4": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=40": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=41": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=42": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=43": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=44": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=45": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=46": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=47": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=48": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=49": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=5": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=50": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=6": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=7": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=8": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=north,horizontal_power=9": { - "model": "ltextras:block/launchpad" + "model": "ltextras:block/jumppad" }, "facing=south,horizontal_power=0": { - "model": "ltextras:block/launchpad_nohoriz", + "model": "ltextras:block/jumppad_nohoriz", "y": 180 }, "facing=south,horizontal_power=1": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=10": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=11": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=12": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=13": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=14": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=15": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=16": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=17": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=18": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=19": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=2": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=20": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=21": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=22": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=23": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=24": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=25": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=26": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=27": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=28": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=29": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=3": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=30": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=31": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=32": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=33": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=34": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=35": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=36": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=37": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=38": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=39": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=4": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=40": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=41": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=42": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=43": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=44": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=45": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=46": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=47": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=48": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=49": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=5": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=50": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=6": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=7": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=8": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=south,horizontal_power=9": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 180 }, "facing=west,horizontal_power=0": { - "model": "ltextras:block/launchpad_nohoriz", + "model": "ltextras:block/jumppad_nohoriz", "y": 270 }, "facing=west,horizontal_power=1": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=10": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=11": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=12": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=13": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=14": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=15": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=16": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=17": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=18": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=19": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=2": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=20": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=21": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=22": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=23": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=24": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=25": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=26": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=27": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=28": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=29": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=3": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=30": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=31": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=32": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=33": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=34": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=35": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=36": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=37": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=38": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=39": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=4": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=40": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=41": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=42": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=43": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=44": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=45": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=46": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=47": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=48": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=49": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=5": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=50": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=6": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=7": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=8": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 }, "facing=west,horizontal_power=9": { - "model": "ltextras:block/launchpad", + "model": "ltextras:block/jumppad", "y": 270 } } diff --git a/src/generated/resources/assets/ltextras/lang/en_ud.json b/src/generated/resources/assets/ltextras/lang/en_ud.json index 06869325..e3ebcb3d 100644 --- a/src/generated/resources/assets/ltextras/lang/en_ud.json +++ b/src/generated/resources/assets/ltextras/lang/en_ud.json @@ -139,7 +139,7 @@ "block.ltextras.imposter_white_concrete_powder": "ɹǝpʍoԀ ǝʇǝɹɔuoƆ ǝʇıɥM ɹǝʇsodɯI", "block.ltextras.imposter_yellow_concrete_powder": "ɹǝpʍoԀ ǝʇǝɹɔuoƆ ʍoןןǝʎ ɹǝʇsodɯI", "block.ltextras.infertile_vine": "ǝuıΛ ǝןıʇɹǝɟuI", - "block.ltextras.launchpad": "pɐdɥɔunɐꞀ", + "block.ltextras.jumppad": "pɐԀ dɯnſ", "block.ltextras.light_blue_concrete_powder_slab": "qɐןS ɹǝpʍoԀ ǝʇǝɹɔuoƆ ǝnןᗺ ʇɥbıꞀ", "block.ltextras.light_blue_concrete_powder_stairs": "sɹıɐʇS ɹǝpʍoԀ ǝʇǝɹɔuoƆ ǝnןᗺ ʇɥbıꞀ", "block.ltextras.light_blue_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝnןᗺ ʇɥbıꞀ", diff --git a/src/generated/resources/assets/ltextras/lang/en_us.json b/src/generated/resources/assets/ltextras/lang/en_us.json index 9b404249..3cc34ff3 100644 --- a/src/generated/resources/assets/ltextras/lang/en_us.json +++ b/src/generated/resources/assets/ltextras/lang/en_us.json @@ -139,7 +139,7 @@ "block.ltextras.imposter_white_concrete_powder": "Imposter White Concrete Powder", "block.ltextras.imposter_yellow_concrete_powder": "Imposter Yellow Concrete Powder", "block.ltextras.infertile_vine": "Infertile Vine", - "block.ltextras.launchpad": "Launchpad", + "block.ltextras.jumppad": "Jump Pad", "block.ltextras.light_blue_concrete_powder_slab": "Light Blue Concrete Powder Slab", "block.ltextras.light_blue_concrete_powder_stairs": "Light Blue Concrete Powder Stairs", "block.ltextras.light_blue_concrete_slab": "Light Blue Concrete Slab", diff --git a/src/generated/resources/assets/ltextras/models/block/jumppad.json b/src/generated/resources/assets/ltextras/models/block/jumppad.json new file mode 100644 index 00000000..dff97b27 --- /dev/null +++ b/src/generated/resources/assets/ltextras/models/block/jumppad.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "ltextras:block/jumppad_bottom", + "particle": "ltextras:block/jumppad_side", + "side": "ltextras:block/jumppad_side", + "top": "ltextras:block/jumppad_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ltextras/models/block/jumppad_nohoriz.json b/src/generated/resources/assets/ltextras/models/block/jumppad_nohoriz.json new file mode 100644 index 00000000..f7601dd4 --- /dev/null +++ b/src/generated/resources/assets/ltextras/models/block/jumppad_nohoriz.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "ltextras:block/jumppad_bottom", + "particle": "ltextras:block/jumppad_side", + "side": "ltextras:block/jumppad_side", + "top": "ltextras:block/jumppad_top_nohoriz" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ltextras/models/block/launchpad.json b/src/generated/resources/assets/ltextras/models/block/launchpad.json deleted file mode 100644 index a2031829..00000000 --- a/src/generated/resources/assets/ltextras/models/block/launchpad.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "ltextras:block/launchpad_bottom", - "particle": "ltextras:block/launchpad_side", - "side": "ltextras:block/launchpad_side", - "top": "ltextras:block/launchpad_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/ltextras/models/block/launchpad_nohoriz.json b/src/generated/resources/assets/ltextras/models/block/launchpad_nohoriz.json deleted file mode 100644 index d10ba6c2..00000000 --- a/src/generated/resources/assets/ltextras/models/block/launchpad_nohoriz.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "ltextras:block/launchpad_bottom", - "particle": "ltextras:block/launchpad_side", - "side": "ltextras:block/launchpad_side", - "top": "ltextras:block/launchpad_top_nohoriz" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/ltextras/models/item/jumppad.json b/src/generated/resources/assets/ltextras/models/item/jumppad.json new file mode 100644 index 00000000..b043b894 --- /dev/null +++ b/src/generated/resources/assets/ltextras/models/item/jumppad.json @@ -0,0 +1,3 @@ +{ + "parent": "ltextras:block/jumppad" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ltextras/models/item/launchpad.json b/src/generated/resources/assets/ltextras/models/item/launchpad.json deleted file mode 100644 index f93f979f..00000000 --- a/src/generated/resources/assets/ltextras/models/item/launchpad.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ltextras:block/launchpad" -} \ No newline at end of file diff --git a/src/generated/resources/data/ltextras/loot_table/blocks/launchpad.json b/src/generated/resources/data/ltextras/loot_table/blocks/jumppad.json similarity index 77% rename from src/generated/resources/data/ltextras/loot_table/blocks/launchpad.json rename to src/generated/resources/data/ltextras/loot_table/blocks/jumppad.json index 2f0f66e8..e0a24117 100644 --- a/src/generated/resources/data/ltextras/loot_table/blocks/launchpad.json +++ b/src/generated/resources/data/ltextras/loot_table/blocks/jumppad.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "ltextras:launchpad" + "name": "ltextras:jumppad" } ], "rolls": 1.0 } ], - "random_sequence": "ltextras:blocks/launchpad" + "random_sequence": "ltextras:blocks/jumppad" } \ No newline at end of file diff --git a/src/main/java/com/lovetropics/extras/ExtraBlocks.java b/src/main/java/com/lovetropics/extras/ExtraBlocks.java index 3c711d53..c241d66d 100644 --- a/src/main/java/com/lovetropics/extras/ExtraBlocks.java +++ b/src/main/java/com/lovetropics/extras/ExtraBlocks.java @@ -17,7 +17,6 @@ import com.tterrag.registrate.util.entry.BlockEntry; import com.tterrag.registrate.util.nullness.NonNullSupplier; import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; -import net.minecraft.advancements.critereon.SimpleCriterionTrigger; import net.minecraft.client.renderer.BiomeColors; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; @@ -47,7 +46,6 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.DoorBlock; import net.minecraft.world.level.block.FenceBlock; -import net.minecraft.world.level.block.HalfTransparentBlock; import net.minecraft.world.level.block.IronBarsBlock; import net.minecraft.world.level.block.LadderBlock; import net.minecraft.world.level.block.PipeBlock; @@ -953,31 +951,32 @@ public InteractionResultHolder use(Level leve, Player player, Interac .build() .register(); - private static BlockEntry LAUNCHPAD = REGISTRATE.block("launchpad", LaunchpadBlock::new) + private static BlockEntry JUMPPAD = REGISTRATE.block("jumppad", JumppadBlock::new) + .lang("Jump Pad") .initialProperties(() -> Blocks.GRASS_BLOCK) .blockstate((ctx, prov) -> { BlockModelBuilder model = prov.models().withExistingParent(ctx.getName(), prov.mcLoc("block/slab")) - .texture("bottom", prov.modLoc("block/launchpad_bottom")) - .texture("side", prov.modLoc("block/launchpad_side")) - .texture("top", prov.modLoc("block/launchpad_top")) - .texture("particle", prov.modLoc("block/launchpad_side")); + .texture("bottom", prov.modLoc("block/jumppad_bottom")) + .texture("side", prov.modLoc("block/jumppad_side")) + .texture("top", prov.modLoc("block/jumppad_top")) + .texture("particle", prov.modLoc("block/jumppad_side")); BlockModelBuilder noHorizontalPowerModel = prov.models().withExistingParent(ctx.getName() + "_nohoriz", prov.mcLoc("block/slab")) - .texture("bottom", prov.modLoc("block/launchpad_bottom")) - .texture("side", prov.modLoc("block/launchpad_side")) - .texture("top", prov.modLoc("block/launchpad_top_nohoriz")) - .texture("particle", prov.modLoc("block/launchpad_side")); + .texture("bottom", prov.modLoc("block/jumppad_bottom")) + .texture("side", prov.modLoc("block/jumppad_side")) + .texture("top", prov.modLoc("block/jumppad_top_nohoriz")) + .texture("particle", prov.modLoc("block/jumppad_side")); prov.getVariantBuilder(ctx.get()).forAllStatesExcept(state -> { - Direction direction = state.getValue(LaunchpadBlock.FACING); - boolean noHorizontalPower = state.getValue(LaunchpadBlock.HORIZONTAL_POWER) < 1; + Direction direction = state.getValue(JumppadBlock.FACING); + boolean noHorizontalPower = state.getValue(JumppadBlock.HORIZONTAL_POWER) < 1; BlockModelBuilder selectedModel = noHorizontalPower ? noHorizontalPowerModel : model; int rotationY = ((int) direction.toYRot() + 180) % 360; return ConfiguredModel.builder() .modelFile(selectedModel) .rotationY(rotationY) .build(); - }, LaunchpadBlock.VERTICAL_POWER); + }, JumppadBlock.VERTICAL_POWER); }) .addLayer(() -> RenderType::solid) diff --git a/src/main/java/com/lovetropics/extras/block/LaunchpadBlock.java b/src/main/java/com/lovetropics/extras/block/JumppadBlock.java similarity index 91% rename from src/main/java/com/lovetropics/extras/block/LaunchpadBlock.java rename to src/main/java/com/lovetropics/extras/block/JumppadBlock.java index 374c4805..02d57a7b 100644 --- a/src/main/java/com/lovetropics/extras/block/LaunchpadBlock.java +++ b/src/main/java/com/lovetropics/extras/block/JumppadBlock.java @@ -3,7 +3,6 @@ import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; @@ -17,15 +16,15 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -public class LaunchpadBlock extends HorizontalDirectionalBlock { +public class JumppadBlock extends HorizontalDirectionalBlock { - public static final MapCodec CODEC = simpleCodec(LaunchpadBlock::new); + public static final MapCodec CODEC = simpleCodec(JumppadBlock::new); private static final VoxelShape AABB = Block.box(0.0, 0.0, 0.0, 16.0, 8.0, 16.0); //Power is divided by 10 since there is no FloatProperty public static final IntegerProperty VERTICAL_POWER = IntegerProperty.create("vertical_power", 0, 50); public static final IntegerProperty HORIZONTAL_POWER = IntegerProperty.create("horizontal_power", 0, 50); - public LaunchpadBlock(final Properties properties) { + public JumppadBlock(final Properties properties) { super(properties); registerDefaultState(defaultBlockState().setValue(VERTICAL_POWER, 10).setValue(HORIZONTAL_POWER, 10)); } diff --git a/src/main/resources/assets/ltextras/textures/block/launchpad_bottom.png b/src/main/resources/assets/ltextras/textures/block/jumppad_bottom.png similarity index 100% rename from src/main/resources/assets/ltextras/textures/block/launchpad_bottom.png rename to src/main/resources/assets/ltextras/textures/block/jumppad_bottom.png diff --git a/src/main/resources/assets/ltextras/textures/block/launchpad_side.png b/src/main/resources/assets/ltextras/textures/block/jumppad_side.png similarity index 100% rename from src/main/resources/assets/ltextras/textures/block/launchpad_side.png rename to src/main/resources/assets/ltextras/textures/block/jumppad_side.png diff --git a/src/main/resources/assets/ltextras/textures/block/launchpad_top.png b/src/main/resources/assets/ltextras/textures/block/jumppad_top.png similarity index 100% rename from src/main/resources/assets/ltextras/textures/block/launchpad_top.png rename to src/main/resources/assets/ltextras/textures/block/jumppad_top.png diff --git a/src/main/resources/assets/ltextras/textures/block/launchpad_top_nohoriz.png b/src/main/resources/assets/ltextras/textures/block/jumppad_top_nohoriz.png similarity index 100% rename from src/main/resources/assets/ltextras/textures/block/launchpad_top_nohoriz.png rename to src/main/resources/assets/ltextras/textures/block/jumppad_top_nohoriz.png