Copper stairs, blocks and slabs are gone.

This commit is contained in:
drcrazy 2021-06-15 00:38:29 +03:00
parent c4011c800b
commit 7216f55ba9
32 changed files with 46 additions and 373 deletions

View file

@ -24,12 +24,14 @@
package techreborn.events;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.*;
import net.minecraft.entity.EquipmentSlot;
import net.minecraft.item.Item;
import net.minecraft.item.Item.Settings;
import net.minecraft.item.Items;
import net.minecraft.item.ToolMaterials;
import net.minecraft.sound.BlockSoundGroup;
import reborncore.RebornRegistry;
import team.reborn.energy.EnergyTier;
import techreborn.TechReborn;
@ -100,6 +102,7 @@ public class ModRegistry {
RebornRegistry.registerBlock(TRContent.RUBBER_PRESSURE_PLATE = InitUtils.setup(new RubberPressurePlateBlock(), "rubber_pressure_plate"), itemGroup);
RebornRegistry.registerBlock(TRContent.RUBBER_DOOR = InitUtils.setup(new RubberDoorBlock(), "rubber_door"), itemGroup);
RebornRegistry.registerBlockNoItem(TRContent.POTTED_RUBBER_SAPLING = InitUtils.setup(new FlowerPotBlock(TRContent.RUBBER_SAPLING, AbstractBlock.Settings.of(Material.DECORATION).breakInstantly().nonOpaque()), "potted_rubber_sapling"));
RebornRegistry.registerBlock(TRContent.COPPER_WALL = InitUtils.setup(new WallBlock(FabricBlockSettings.of(Material.METAL).strength(2f, 2f).sounds(BlockSoundGroup.METAL)), "copper_wall"), itemGroup);
TechReborn.LOGGER.debug("TechReborns Blocks Loaded");
}

View file

@ -27,6 +27,7 @@ package techreborn.init;
import net.fabricmc.fabric.api.loot.v1.FabricLootPoolBuilder;
import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback;
import net.minecraft.item.ItemConvertible;
import net.minecraft.item.Items;
import net.minecraft.loot.LootPool;
import net.minecraft.loot.entry.ItemEntry;
import net.minecraft.loot.entry.LootPoolEntry;
@ -40,7 +41,7 @@ public class ModLoot {
public static void init() {
LootPoolEntry copperIngot = makeEntry(Ingots.COPPER);
LootPoolEntry copperIngot = makeEntry(Items.COPPER_INGOT);
LootPoolEntry tinIngot = makeEntry(Ingots.TIN);
LootPoolEntry leadIngot = makeEntry(Ingots.LEAD);
LootPoolEntry silverIngot = makeEntry(Ingots.SILVER);

View file

@ -114,6 +114,7 @@ public class TRContent {
public static Block RUBBER_WOOD;
public static Block STRIPPED_RUBBER_WOOD;
public static Block POTTED_RUBBER_SAPLING;
public static Block COPPER_WALL;
// Armor
public static Item CLOAKING_DEVICE;
@ -426,7 +427,7 @@ public class TRContent {
}
public enum StorageBlocks implements ItemConvertible {
ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, INVAR, IRIDIUM, IRIDIUM_REINFORCED_STONE,
ALUMINUM, BRASS, BRONZE, CHROME, ELECTRUM, INVAR, IRIDIUM, IRIDIUM_REINFORCED_STONE,
IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, PERIDOT, PLATINUM, RED_GARNET, REFINED_IRON, RUBY,
SAPPHIRE, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, YELLOW_GARNET, ZINC;
@ -671,7 +672,7 @@ public class TRContent {
}
public enum Ingots implements ItemConvertible {
ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM_ALLOY, IRIDIUM,
ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM_ALLOY, IRIDIUM,
LEAD, MIXED_METAL, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC;
public final String name;

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/ore/copper_ore" }
}
}

View file

@ -1,5 +0,0 @@
{
"variants": {
"": { "model": "techreborn:block/storage/copper_storage_block" }
}
}

View file

@ -1,13 +0,0 @@
{
"variants": {
"type=bottom": {
"model": "techreborn:block/storage/copper_storage_block_slab"
},
"type=double": {
"model": "techreborn:block/storage/copper_storage_block"
},
"type=top": {
"model": "techreborn:block/storage/copper_storage_block_slab_top"
}
}
}

View file

@ -1,209 +0,0 @@
{
"variants": {
"facing=east,half=bottom,shape=inner_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"y": 270,
"uvlock": true
},
"facing=east,half=bottom,shape=inner_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner"
},
"facing=east,half=bottom,shape=outer_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"y": 270,
"uvlock": true
},
"facing=east,half=bottom,shape=outer_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer"
},
"facing=east,half=bottom,shape=straight": {
"model": "techreborn:block/storage/copper_storage_block_stairs"
},
"facing=east,half=top,shape=inner_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"x": 180,
"uvlock": true
},
"facing=east,half=top,shape=inner_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=east,half=top,shape=outer_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"x": 180,
"uvlock": true
},
"facing=east,half=top,shape=outer_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=east,half=top,shape=straight": {
"model": "techreborn:block/storage/copper_storage_block_stairs",
"x": 180,
"uvlock": true
},
"facing=north,half=bottom,shape=inner_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"y": 180,
"uvlock": true
},
"facing=north,half=bottom,shape=inner_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"y": 270,
"uvlock": true
},
"facing=north,half=bottom,shape=outer_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"y": 180,
"uvlock": true
},
"facing=north,half=bottom,shape=outer_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"y": 270,
"uvlock": true
},
"facing=north,half=bottom,shape=straight": {
"model": "techreborn:block/storage/copper_storage_block_stairs",
"y": 270,
"uvlock": true
},
"facing=north,half=top,shape=inner_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=north,half=top,shape=inner_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"x": 180,
"uvlock": true
},
"facing=north,half=top,shape=outer_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=north,half=top,shape=outer_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"x": 180,
"uvlock": true
},
"facing=north,half=top,shape=straight": {
"model": "techreborn:block/storage/copper_storage_block_stairs",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=south,half=bottom,shape=inner_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner"
},
"facing=south,half=bottom,shape=inner_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"y": 90,
"uvlock": true
},
"facing=south,half=bottom,shape=outer_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer"
},
"facing=south,half=bottom,shape=outer_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"y": 90,
"uvlock": true
},
"facing=south,half=bottom,shape=straight": {
"model": "techreborn:block/storage/copper_storage_block_stairs",
"y": 90,
"uvlock": true
},
"facing=south,half=top,shape=inner_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=south,half=top,shape=inner_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=south,half=top,shape=outer_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=south,half=top,shape=outer_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=south,half=top,shape=straight": {
"model": "techreborn:block/storage/copper_storage_block_stairs",
"x": 180,
"y": 90,
"uvlock": true
},
"facing=west,half=bottom,shape=inner_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"y": 90,
"uvlock": true
},
"facing=west,half=bottom,shape=inner_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"y": 180,
"uvlock": true
},
"facing=west,half=bottom,shape=outer_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"y": 90,
"uvlock": true
},
"facing=west,half=bottom,shape=outer_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"y": 180,
"uvlock": true
},
"facing=west,half=bottom,shape=straight": {
"model": "techreborn:block/storage/copper_storage_block_stairs",
"y": 180,
"uvlock": true
},
"facing=west,half=top,shape=inner_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=west,half=top,shape=inner_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_inner",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=west,half=top,shape=outer_left": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"x": 180,
"y": 180,
"uvlock": true
},
"facing=west,half=top,shape=outer_right": {
"model": "techreborn:block/storage/copper_storage_block_stairs_outer",
"x": 180,
"y": 270,
"uvlock": true
},
"facing=west,half=top,shape=straight": {
"model": "techreborn:block/storage/copper_storage_block_stairs",
"x": 180,
"y": 180,
"uvlock": true
}
}
}

View file

@ -5,7 +5,7 @@
"up": "true"
},
"apply": {
"model": "techreborn:block/storage/copper_storage_block_wall_post"
"model": "techreborn:block/storage/copper_wall_post"
}
},
{
@ -13,7 +13,7 @@
"north": "low"
},
"apply": {
"model": "techreborn:block/storage/copper_storage_block_wall_side",
"model": "techreborn:block/storage/copper_wall_side",
"uvlock": true
}
},
@ -22,7 +22,7 @@
"east": "low"
},
"apply": {
"model": "techreborn:block/storage/copper_storage_block_wall_side",
"model": "techreborn:block/storage/copper_wall_side",
"y": 90,
"uvlock": true
}
@ -32,7 +32,7 @@
"south": "low"
},
"apply": {
"model": "techreborn:block/storage/copper_storage_block_wall_side",
"model": "techreborn:block/storage/copper_wall_side",
"y": 180,
"uvlock": true
}
@ -42,7 +42,7 @@
"west": "low"
},
"apply": {
"model": "techreborn:block/storage/copper_storage_block_wall_side",
"model": "techreborn:block/storage/copper_wall_side",
"y": 270,
"uvlock": true
}
@ -52,7 +52,7 @@
"north": "tall"
},
"apply": {
"model": "techreborn:block/storage/copper_storage_block_wall_side_tall",
"model": "techreborn:block/storage/copper_wall_side_tall",
"uvlock": true
}
},
@ -61,7 +61,7 @@
"east": "tall"
},
"apply": {
"model": "techreborn:block/storage/copper_storage_block_wall_side_tall",
"model": "techreborn:block/storage/copper_wall_side_tall",
"y": 90,
"uvlock": true
}
@ -71,7 +71,7 @@
"south": "tall"
},
"apply": {
"model": "techreborn:block/storage/copper_storage_block_wall_side_tall",
"model": "techreborn:block/storage/copper_wall_side_tall",
"y": 180,
"uvlock": true
}
@ -81,7 +81,7 @@
"west": "tall"
},
"apply": {
"model": "techreborn:block/storage/copper_storage_block_wall_side_tall",
"model": "techreborn:block/storage/copper_wall_side_tall",
"y": 270,
"uvlock": true
}

View file

@ -146,10 +146,7 @@
"block.techreborn.chrome_storage_block_stairs": "Chrome Stairs",
"block.techreborn.chrome_storage_block_slab": "Chrome Slab",
"block.techreborn.chrome_storage_block_wall": "Chrome Wall",
"block.techreborn.copper_storage_block": "Block of Copper",
"block.techreborn.copper_storage_block_stairs": "Copper Stairs",
"block.techreborn.copper_storage_block_slab": "Copper Slab",
"block.techreborn.copper_storage_block_wall": "Copper Wall",
"block.techreborn.copper_wall": "Copper Wall",
"block.techreborn.electrum_storage_block": "Block of Electrum",
"block.techreborn.electrum_storage_block_stairs": "Electrum Stairs",
"block.techreborn.electrum_storage_block_slab": "Electrum Slab",

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "techreborn:block/storage/copper_storage_block"
}
}

View file

@ -1,8 +0,0 @@
{
"parent": "minecraft:block/slab",
"textures": {
"bottom": "techreborn:block/storage/copper_storage_block",
"top": "techreborn:block/storage/copper_storage_block",
"side": "techreborn:block/storage/copper_storage_block"
}
}

View file

@ -1,8 +0,0 @@
{
"parent": "minecraft:block/slab_top",
"textures": {
"bottom": "techreborn:block/storage/copper_storage_block",
"top": "techreborn:block/storage/copper_storage_block",
"side": "techreborn:block/storage/copper_storage_block"
}
}

View file

@ -1,8 +0,0 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "techreborn:block/storage/copper_storage_block",
"top": "techreborn:block/storage/copper_storage_block",
"side": "techreborn:block/storage/copper_storage_block"
}
}

View file

@ -1,8 +0,0 @@
{
"parent": "minecraft:block/inner_stairs",
"textures": {
"bottom": "techreborn:block/storage/copper_storage_block",
"top": "techreborn:block/storage/copper_storage_block",
"side": "techreborn:block/storage/copper_storage_block"
}
}

View file

@ -1,8 +0,0 @@
{
"parent": "minecraft:block/outer_stairs",
"textures": {
"bottom": "techreborn:block/storage/copper_storage_block",
"top": "techreborn:block/storage/copper_storage_block",
"side": "techreborn:block/storage/copper_storage_block"
}
}

View file

@ -1,3 +0,0 @@
{
"parent": "techreborn:block/storage/copper_storage_block"
}

View file

@ -1,3 +0,0 @@
{
"parent": "techreborn:block/storage/copper_storage_block_slab"
}

View file

@ -1,3 +0,0 @@
{
"parent": "techreborn:block/storage/copper_storage_block_stairs"
}

View file

@ -1,3 +0,0 @@
{
"parent": "techreborn:block/storage/copper_storage_block_wall_inventory"
}

View file

@ -0,0 +1,3 @@
{
"parent": "techreborn:block/storage/copper_wall_inventory"
}

View file

@ -5,6 +5,7 @@
"techreborn:brass_storage_block_wall",
"techreborn:bronze_storage_block_wall",
"techreborn:chrome_storage_block_wall",
"techreborn:copper_wall",
"techreborn:electrum_storage_block_wall",
"techreborn:invar_storage_block_wall",
"techreborn:iridium_storage_block_wall",

View file

@ -1,19 +0,0 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "techreborn:copper_storage_block"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -1,12 +0,0 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "techreborn:copper_storage_block"
}
],
"result": {
"item": "minecraft:copper_ingot",
"count": 9
}
}

View file

@ -1,12 +0,0 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "techreborn:copper_ingot"
}
],
"result": {
"item": "minecraft:copper_ingot",
"count": 1
}
}

View file

@ -1,12 +0,0 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "techreborn:copper_storage_block_slab"
}
],
"result": {
"item": "minecraft:copper_ingot",
"count": 4
}
}

View file

@ -1,12 +0,0 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "techreborn:copper_storage_block_stairs"
}
],
"result": {
"item": "minecraft:copper_ingot",
"count": 9
}
}

View file

@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"###"
],
"key": {
"#": {
"item": "minecraft:copper_block"
}
},
"result": {
"item": "techreborn:copper_wall",
"count": 6
}
}

View file

@ -0,0 +1,8 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "minecraft:copper_block"
},
"result": "techreborn:copper_wall",
"count": 1
}