MinecraftMods/Thresholds
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add cyan variant, adjust red block wall models

Browse source
This commit is contained in:
zontreck 2024-01-23 16:23:43 -07:00
parent 2e4fac3de4
commit 40a3ae346e
50 changed files with 411 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -49,7 +49,7 @@ mod_name=Thresholds
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=GPLv3
# The mod version. See https://semver.org/
mod_version=1.4.012224.2229
mod_version=1.4.012324.1609
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html

27
src/main/java/dev/zontreck/otemod/blocks/ModBlocks.java
View file

@ -144,19 +144,40 @@ public class ModBlocks {
public static final RegistryObject<Item> T_RED_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_tile", ()->new BlockItem(T_RED_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
public static final RegistryObject<Block> T_RED_TILE_WALL = BLOCKS.register("red_tile_to_wall", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_RED_TILE.get())));
public static final RegistryObject<Block> T_RED_TILE_WALL = BLOCKS.register("red_tile_to_wall", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get())));
public static final RegistryObject<Item> T_RED_TILE_WALL_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_tile_to_wall", ()->new BlockItem(T_RED_TILE_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
public static final RegistryObject<Block> T_RED_WALL = BLOCKS.register("red_wall_variant_1", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_RED_TILE.get())));
public static final RegistryObject<Block> T_RED_WALL = BLOCKS.register("red_wall_variant_1", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get())));
public static final RegistryObject<Item> T_RED_WALL_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_wall_variant_1", ()->new BlockItem(T_RED_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
public static final RegistryObject<Block> T_RED_WALL2 = BLOCKS.register("red_wall_variant_2", ()->new RotatableBlock(BlockBehaviour.Properties.copy(T_RED_TILE.get())));
public static final RegistryObject<Block> T_RED_WALL2 = BLOCKS.register("red_wall_variant_2", ()->new Block(BlockBehaviour.Properties.copy(T_RED_TILE.get())));
public static final RegistryObject<Item> T_RED_WALL2_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("red_wall_variant_2", ()->new BlockItem(T_RED_WALL2.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
public static final RegistryObject<Block> T_CYAN = BLOCKS.register("cyan", ()->new Block(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN)));
public static final RegistryObject<Item> T_CYAN_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan", ()-> new BlockItem(T_CYAN.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
public static final RegistryObject<Block> T_CYAN_TILE = BLOCKS.register("cyan_tile", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN.get())));
public static final RegistryObject<Item> T_CYAN_TILE_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan_tile", ()->new BlockItem(T_CYAN_TILE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
public static final RegistryObject<Block> T_CYAN_TILE_WALL = BLOCKS.register("cyan_tile_to_wall", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get())));
public static final RegistryObject<Item> T_CYAN_TILE_WALL_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan_tile_to_wall", ()->new BlockItem(T_CYAN_TILE_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
public static final RegistryObject<Block> T_CYAN_WALL = BLOCKS.register("cyan_wall_variant_1", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get())));
public static final RegistryObject<Item> T_CYAN_WALL_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan_wall_variant_1", ()->new BlockItem(T_CYAN_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
public static final RegistryObject<Block> T_CYAN_WALL2 = BLOCKS.register("cyan_wall_variant_2", ()->new Block(BlockBehaviour.Properties.copy(T_CYAN_TILE.get())));
public static final RegistryObject<Item> T_CYAN_WALL2_I = CreativeModeTabs.addToOTEModTab(ITEMS.register("cyan_wall_variant_2", ()->new BlockItem(T_CYAN_WALL2.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS))));
/*

7
src/main/resources/assets/otemod/blockstates/cyan.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "otemod:block/cyan"
}
}
}

7
src/main/resources/assets/otemod/blockstates/cyan_tile.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "otemod:block/cyan_tile"
}
}
}

7
src/main/resources/assets/otemod/blockstates/cyan_tile_to_wall.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "otemod:block/cyan_tile_to_wall"
}
}
}

7
src/main/resources/assets/otemod/blockstates/cyan_wall_variant_1.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "otemod:block/cyan_wall_variant_1"
}
}
}

7
src/main/resources/assets/otemod/blockstates/cyan_wall_variant_2.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "otemod:block/cyan_wall_variant_2"
}
}
}

14
src/main/resources/assets/otemod/blockstates/red_tile_to_wall.json
View file

@ -1,19 +1,7 @@
{
"variants": {
"facing=north": {
"model": "otemod:block/red_tile_to_wall",
"y": 180
},
"facing=east": {
"model": "otemod:block/red_tile_to_wall",
"y": 270
},
"facing=south": {
"": {
"model": "otemod:block/red_tile_to_wall"
},
"facing=west": {
"model": "otemod:block/red_tile_to_wall",
"y": 90
}
}
}

14
src/main/resources/assets/otemod/blockstates/red_wall_variant_1.json
View file

@ -1,19 +1,7 @@
{
"variants": {
"facing=north": {
"model": "otemod:block/red_wall_variant_1",
"y": 180
},
"facing=east": {
"model": "otemod:block/red_wall_variant_1",
"y": 270
},
"facing=south": {
"": {
"model": "otemod:block/red_wall_variant_1"
},
"facing=west": {
"model": "otemod:block/red_wall_variant_1",
"y": 90
}
}
}

14
src/main/resources/assets/otemod/blockstates/red_wall_variant_2.json
View file

@ -1,19 +1,7 @@
{
"variants": {
"facing=north": {
"model": "otemod:block/red_wall_variant_2",
"y": 180
},
"facing=east": {
"model": "otemod:block/red_wall_variant_2",
"y": 270
},
"facing=south": {
"": {
"model": "otemod:block/red_wall_variant_2"
},
"facing=west": {
"model": "otemod:block/red_wall_variant_2",
"y": 90
}
}
}

5
src/main/resources/assets/otemod/lang/en_us.json
View file

@ -73,6 +73,11 @@
"block.otemod.red_tile_to_wall": "Red Floor To Wall Transition",
"block.otemod.red_wall_variant_1": "Red Wall",
"block.otemod.red_wall_variant_2": "Red Wall",
"block.otemod.cyan": "Cyan",
"block.otemod.cyan_tile": "Cyan Tile",
"block.otemod.cyan_tile_to_wall": "Cyan Floor To Wall Transition",
"block.otemod.cyan_wall_variant_1": "Cyan Wall",
"block.otemod.cyan_wall_variant_2": "Cyan Wall",
"enchantment.otemod.mob_egging": "Mob Egging",

6
src/main/resources/assets/otemod/models/block/cyan.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "otemod:block/thresholds/cyan"
}
}

7
src/main/resources/assets/otemod/models/block/cyan_tile.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_top",
"textures": {
"top": "otemod:block/thresholds/hallway/floor/tiles/cyan_tile_w_circle",
"side": "otemod:block/thresholds/cyan"
}
}

7
src/main/resources/assets/otemod/models/block/cyan_tile_to_wall.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "otemod:block/sided",
"textures": {
"side": "otemod:block/thresholds/hallway/wall/cyan_floor_to_wall",
"top": "otemod:block/thresholds/cyan"
}
}

7
src/main/resources/assets/otemod/models/block/cyan_wall_variant_1.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "otemod:block/sided",
"textures": {
"side": "otemod:block/thresholds/hallway/wall/cyan_wall",
"top": "otemod:block/thresholds/cyan"
}
}

7
src/main/resources/assets/otemod/models/block/cyan_wall_variant_2.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "otemod:block/sided",
"textures": {
"side": "otemod:block/thresholds/hallway/wall/cyan_wall2",
"top": "otemod:block/thresholds/cyan"
}
}

6
src/main/resources/assets/otemod/models/block/red_tile_to_wall.json
View file

@ -1,7 +1,7 @@
{
"parent": "otemod:block/rotatable",
"parent": "otemod:block/sided",
"textures": {
"front": "otemod:block/thresholds/hallway/wall/red_floor_to_wall",
"side": "otemod:block/thresholds/blood_red"
"side": "otemod:block/thresholds/hallway/wall/red_floor_to_wall",
"top": "otemod:block/thresholds/blood_red"
}
}

6
src/main/resources/assets/otemod/models/block/red_wall_variant_1.json
View file

@ -1,7 +1,7 @@
{
"parent": "otemod:block/rotatable",
"parent": "otemod:block/sided",
"textures": {
"front": "otemod:block/thresholds/hallway/wall/red_wall",
"side": "otemod:block/thresholds/blood_red"
"side": "otemod:block/thresholds/hallway/wall/red_wall",
"top": "otemod:block/thresholds/blood_red"
}
}

6
src/main/resources/assets/otemod/models/block/red_wall_variant_2.json
View file

@ -1,7 +1,7 @@
{
"parent": "otemod:block/rotatable",
"parent": "otemod:block/sided",
"textures": {
"front": "otemod:block/thresholds/hallway/wall/red_wall2",
"side": "otemod:block/thresholds/blood_red"
"side": "otemod:block/thresholds/hallway/wall/red_wall2",
"top": "otemod:block/thresholds/blood_red"
}
}

12
src/main/resources/assets/otemod/models/block/sided.json Normal file
View file

@ -0,0 +1,12 @@
{
"parent": "minecraft:block/cube",
"textures": {
"particle": "#side",
"down": "#top",
"up": "#top",
"north": "#side",
"east": "#side",
"south": "#side",
"west": "#side"
}
}

3
src/main/resources/assets/otemod/models/item/cyan.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "otemod:block/cyan"
}

3
src/main/resources/assets/otemod/models/item/cyan_tile.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "otemod:block/cyan_tile"
}

3
src/main/resources/assets/otemod/models/item/cyan_tile_to_wall.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "otemod:block/cyan_tile_to_wall"
}

3
src/main/resources/assets/otemod/models/item/cyan_wall_variant_1.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "otemod:block/cyan_wall_variant_1"
}

3
src/main/resources/assets/otemod/models/item/cyan_wall_variant_2.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "otemod:block/cyan_wall_variant_2"
}

BIN
src/main/resources/assets/otemod/textures/block/thresholds/cyan.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 99 B

BIN
src/main/resources/assets/otemod/textures/block/thresholds/hallway/floor/tiles/cyan_tile_w_circle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 262 B

BIN
src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/cyan_floor_to_wall.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 213 B

BIN
src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/cyan_wall.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 129 B

BIN
src/main/resources/assets/otemod/textures/block/thresholds/hallway/wall/cyan_wall2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 165 B

14
src/main/resources/data/otemod/loot_tables/blocks/cyan.json Normal file
View file

@ -0,0 +1,14 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "otemod:cyan"
}
]
}
]
}

14
src/main/resources/data/otemod/loot_tables/blocks/cyan_tile.json Normal file
View file

@ -0,0 +1,14 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "otemod:cyan_tile"
}
]
}
]
}

14
src/main/resources/data/otemod/loot_tables/blocks/cyan_tile_to_wall.json Normal file
View file

@ -0,0 +1,14 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "otemod:cyan_tile_to_wall"
}
]
}
]
}

14
src/main/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_1.json Normal file
View file

@ -0,0 +1,14 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "otemod:cyan_wall_variant_1"
}
]
}
]
}

14
src/main/resources/data/otemod/loot_tables/blocks/cyan_wall_variant_2.json Normal file
View file

@ -0,0 +1,14 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "otemod:cyan_wall_variant_2"
}
]
}
]
}

20
src/main/resources/data/otemod/recipes/thresholds/decorative/cyan.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"AAA",
"ABA",
"AAA"
],
"key": {
"A": {
"item": "minecraft:cyan_wool"
},
"B": {
"item": "minecraft:obsidian"
}
},
"result": {
"item": "otemod:cyan",
"count": 4
}
}

20
src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"ABA",
"BAB",
"ABA"
],
"key": {
"A": {
"item": "otemod:cyan"
},
"B": {
"item": "otemod:whiteout"
}
},
"result": {
"item": "otemod:cyan_tile",
"count": 2
}
}

20
src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_tile_to_wall.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"AAA",
"BAB",
"ABA"
],
"key": {
"A": {
"item": "otemod:cyan"
},
"B": {
"item": "otemod:whiteout"
}
},
"result": {
"item": "otemod:cyan_tile_to_wall",
"count": 2
}
}

20
src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_wall_variant_1.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"AAA",
"AAA",
"BAB"
],
"key": {
"A": {
"item": "otemod:cyan"
},
"B": {
"item": "otemod:whiteout"
}
},
"result": {
"item": "otemod:cyan_wall_variant_1",
"count": 2
}
}

20
src/main/resources/data/otemod/recipes/thresholds/decorative/cyan_wall_variant_2.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"BAB",
"AAA",
"BAB"
],
"key": {
"A": {
"item": "otemod:cyan"
},
"B": {
"item": "otemod:whiteout"
}
},
"result": {
"item": "otemod:cyan_wall_variant_2",
"count": 2
}
}

3
src/main/resources/data/otemod/tinkering/enchantments_to_modifiers.json
View file

@ -1,3 +1,4 @@
{
"otemod:mob_egging": "otemod:eggables"
"otemod:mob_egging": "otemod:eggable",
"otemod:flight": "otemod:flying"
}

6
src/main/resources/data/otemod/tinkering/materials/definitions/eternium.json Normal file
View file

@ -0,0 +1,6 @@
{
"craftable": true,
"tier": 1,
"sortOrder": 20,
"hidden": false
}

6
src/main/resources/data/otemod/tinkering/materials/definitions/ilusium.json Normal file
View file

@ -0,0 +1,6 @@
{
"craftable": true,
"tier": 1,
"sortOrder": 20,
"hidden": false
}

28
src/main/resources/data/otemod/tinkering/materials/stats/eternium.json Normal file
View file

@ -0,0 +1,28 @@
{
"stats": {
"tconstruct:head": {
"durability": 1800,
"miningSpeed": 3.5,
"harvestTier": "minecraft:diamond",
"attack": 1.25
},
"tconstruct:extra": {},
"tconstruct:limb": {
"durability": 800,
"drawSpeed": 0.05,
"velocity": 0.05,
"accuracy": 0.05
},
"tconstruct:grip": {
"durability": 1.05,
"accuracy": 0.05,
"meleeAttack": 2.25
},
"tconstruct:handle": {
"durability": 1.05,
"miningSpeed": 1.05,
"attackSpeed": 1.05,
"attackDamage": 1.0
}
}
}

28
src/main/resources/data/otemod/tinkering/materials/stats/ilusium.json Normal file
View file

@ -0,0 +1,28 @@
{
"stats": {
"tconstruct:head": {
"durability": 1800,
"miningSpeed": 3.5,
"harvestTier": "minecraft:diamond",
"attack": 1.25
},
"tconstruct:extra": {},
"tconstruct:limb": {
"durability": 800,
"drawSpeed": 0.05,
"velocity": 0.05,
"accuracy": 0.05
},
"tconstruct:grip": {
"durability": 1.05,
"accuracy": 0.05,
"meleeAttack": 2.25
},
"tconstruct:handle": {
"durability": 1.05,
"miningSpeed": 1.05,
"attackSpeed": 1.05,
"attackDamage": 1.0
}
}
}

0
src/main/resources/data/otemod/tinkering/materials/traits/eggables.json → src/main/resources/data/otemod/tinkering/materials/traits/eternium.json
View file

6
src/main/resources/data/otemod/tinkering/materials/traits/ilusium.json Normal file
View file

@ -0,0 +1,6 @@
{
"default":{
"name": "otemod:flying",
"level": 1
}
}

15
src/main/resources/data/otemod/tinkering/modifiers/eggable.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "tconstruct:composable",
"level_display": {
"type": "tconstruct:unique",
"unique_until": 6
},
"tooltip_display": "always",
"modules": [
{
"type": "tconstruct:harvest_enchantment",
"name": "otemod:mob_egging",
"level": 1
}
]
}

8
src/main/resources/data/otemod/tinkering/modifiers/eggables.json
View file

@ -1,8 +0,0 @@
{
"type": "tconstruct:loot",
"level_display": "tconstruct:default",
"enchantment": {
"name": "otemod:mob_egging",
"level": 1
}
}

12
src/main/resources/data/otemod/tinkering/modifiers/flying.json Normal file
View file

@ -0,0 +1,12 @@
{
"type": "tconstruct:composable",
"level_display": "tconstruct:no_levels",
"tooltip_display": "always",
"modules": [
{
"type": "tconstruct:constant_enchantment",
"name": "otemod:flight",
"level": 1
}
]
}