Skip to content

Commit

Permalink
Model Fixes, Loot Tables, Lang Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
SaishoVibes committed Mar 20, 2023
1 parent 14cfdf4 commit d0fdc8a
Show file tree
Hide file tree
Showing 100 changed files with 4,211 additions and 39 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package net.saishovibes.back_in_classic;

import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.minecraft.client.render.RenderLayer;
import net.saishovibes.back_in_classic.registry.back_in_classic_blocks;
import net.saishovibes.back_in_classic.registry.back_in_classic_items;

public class Back_In_Classic_Client implements ClientModInitializer {
public void onInitializeClient() {
BlockRenderLayerMap.INSTANCE.putBlock(back_in_classic_blocks.BLUE_ROSE, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(back_in_classic_blocks.RED_ROSE, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(back_in_classic_blocks.PAEONIA, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(back_in_classic_blocks.SHRUB, RenderLayer.getCutout());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ public interface back_in_classic_blocks {
Map<Identifier, Block> BLOCKS = new LinkedHashMap<>();

//BLOCKS
Block WAX_BLOCK = register(new Identifier(Back_In_Classic.MODID, "wax_block"), new Block(FabricBlockSettings.copyOf(Blocks.HONEYCOMB_BLOCK).nonOpaque()));
Block CLASSIC_NETHER_PORTAL = register(new Identifier(Back_In_Classic.MODID, "classic_nether_portal"), new Block(FabricBlockSettings.copyOf(Blocks.HONEYCOMB_BLOCK).nonOpaque()));
Block COGWHEEL = register(new Identifier(Back_In_Classic.MODID, "cogwheel"), new Block(FabricBlockSettings.copyOf(Blocks.REDSTONE_BLOCK).nonOpaque()));
Block DIRT_SLAB = register(new Identifier(Back_In_Classic.MODID, "dirt_slab"), new Block(FabricBlockSettings.copyOf(Blocks.PETRIFIED_OAK_SLAB).nonOpaque()));
Block WAX_BLOCK = register(new Identifier(Back_In_Classic.MODID, "wax_block"), new SlimeBlock(FabricBlockSettings.copyOf(Blocks.HONEYCOMB_BLOCK)));
Block CLASSIC_NETHER_PORTAL = register(new Identifier(Back_In_Classic.MODID, "classic_nether_portal"), new Block(FabricBlockSettings.copyOf(Blocks.HONEYCOMB_BLOCK).luminance(9)));
Block COGWHEEL = register(new Identifier(Back_In_Classic.MODID, "cogwheel"), new Block(FabricBlockSettings.copyOf(Blocks.REDSTONE_BLOCK)));
Block DIRT_SLAB = register(new Identifier(Back_In_Classic.MODID, "dirt_slab"), new SlabBlock(FabricBlockSettings.copyOf(Blocks.PETRIFIED_OAK_SLAB).nonOpaque()));
Block GEAR = register(new Identifier(Back_In_Classic.MODID, "gear"), new Block(FabricBlockSettings.copyOf(Blocks.REDSTONE_WIRE).nonOpaque()));
Block GLOWING_OBSIDIAN = register(new Identifier(Back_In_Classic.MODID, "glowing_obsidian"), new Block(FabricBlockSettings.copyOf(Blocks.OBSIDIAN).nonOpaque()));
Block GLOWING_OBSIDIAN = register(new Identifier(Back_In_Classic.MODID, "glowing_obsidian"), new Block(FabricBlockSettings.copyOf(Blocks.OBSIDIAN).luminance(10)));
Block INF_LAVA = register(new Identifier(Back_In_Classic.MODID, "infinite_lava"), new Block(FabricBlockSettings.copyOf(Blocks.LAVA).nonOpaque()));
Block INF_WATER = register(new Identifier(Back_In_Classic.MODID, "infinite_water"), new Block(FabricBlockSettings.copyOf(Blocks.WATER).nonOpaque()));
Block REV_GEAR = register(new Identifier(Back_In_Classic.MODID, "inverse_gear"), new Block(FabricBlockSettings.copyOf(Blocks.REDSTONE_WIRE).nonOpaque()));
Block NETHER_REACTOR = register(new Identifier(Back_In_Classic.MODID, "nether_reactor_core"), new Block(FabricBlockSettings.copyOf(Blocks.GLOWSTONE).nonOpaque()));
Block SOD_BLOCK = register(new Identifier(Back_In_Classic.MODID, "sod_block"), new Block(FabricBlockSettings.copyOf(Blocks.MOSS_BLOCK).nonOpaque()));
Block SOD_SLAB = register(new Identifier(Back_In_Classic.MODID, "sod_slab"), new Block(FabricBlockSettings.copyOf(Blocks.OAK_SLAB).nonOpaque()));
Block CRUSHED_GRAVEL = register(new Identifier(Back_In_Classic.MODID, "crushed_gravel"), new Block(FabricBlockSettings.copyOf(Blocks.GRAVEL).nonOpaque()));
Block NETHER_REACTOR = register(new Identifier(Back_In_Classic.MODID, "nether_reactor_core"), new Block(FabricBlockSettings.copyOf(Blocks.GLOWSTONE).luminance(12)));
Block SOD_BLOCK = register(new Identifier(Back_In_Classic.MODID, "sod_block"), new Block(FabricBlockSettings.copyOf(Blocks.MOSS_BLOCK)));
Block SOD_SLAB = register(new Identifier(Back_In_Classic.MODID, "sod_slab"), new SlabBlock(FabricBlockSettings.copyOf(Blocks.OAK_SLAB).nonOpaque()));
Block CRUSHED_GRAVEL = register(new Identifier(Back_In_Classic.MODID, "crushed_gravel"), new FallingBlock(FabricBlockSettings.copyOf(Blocks.GRAVEL)));

//PLANTS
Block BLUE_ROSE = register(new Identifier(Back_In_Classic.MODID, "blue_rose"), new Block(FabricBlockSettings.copyOf(Blocks.BLUE_ORCHID).nonOpaque()));
Block PAEONIA = register(new Identifier(Back_In_Classic.MODID, "paeonia_flower"), new Block(FabricBlockSettings.copyOf(Blocks.PINK_TULIP).nonOpaque()));
Block RED_ROSE = register(new Identifier(Back_In_Classic.MODID, "red_rose"), new Block(FabricBlockSettings.copyOf(Blocks.POPPY).nonOpaque()));
Block SHRUB = register(new Identifier(Back_In_Classic.MODID, "shrub"), new Block(FabricBlockSettings.copyOf(Blocks.DEAD_BUSH).nonOpaque()));
Block BLUE_ROSE = register(new Identifier(Back_In_Classic.MODID, "blue_rose"), new PlantBlock(FabricBlockSettings.copyOf(Blocks.BLUE_ORCHID).nonOpaque()));
Block PAEONIA = register(new Identifier(Back_In_Classic.MODID, "paeonia_flower"), new PlantBlock(FabricBlockSettings.copyOf(Blocks.PINK_TULIP).nonOpaque()));
Block RED_ROSE = register(new Identifier(Back_In_Classic.MODID, "red_rose"), new PlantBlock(FabricBlockSettings.copyOf(Blocks.POPPY).nonOpaque()));
Block SHRUB = register(new Identifier(Back_In_Classic.MODID, "shrub"), new PlantBlock(FabricBlockSettings.copyOf(Blocks.DEAD_BUSH).nonOpaque()));

//CAULDRONS
Block AWKWARD_CAULDRON = register(new Identifier(Back_In_Classic.MODID, "awkward_cauldron"), new Block(FabricBlockSettings.copyOf(Blocks.CAULDRON).nonOpaque()));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "back_in_classic:block/blue_rose"
}
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "back_in_classic:block/red_rose"
}
}
}

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/resources/assets/back_in_classic/lang/en_uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"key.back_in_classic.nether_portal_key": "Nether Portal Key",
"subtitles.waterfall": "Water Crashes",
"enchantment.back_in_classic.sharpshot": "Sharpshot",
"block.back_in_classic.blue_rose": "Cave Rose",
"block.back_in_classic.blue_rose": "Blue Rose",
"item.back_in_classic.plate_chestplate": "Plated Body",
"biome.back_in_classic.classic_plains": "Classic Plains",
"subtitles.ocean_loop": "Waves Crash",
Expand All @@ -49,7 +49,7 @@
"biome.back_in_classic.scenic_gravel_beach": "Scenic Sand Beach",
"item.back_in_classic.plate_boots": "Plated Boots",
"item.back_in_classic.fire": "Fire",
"block.back_in_classic.red_rose": "Wild Rose",
"block.back_in_classic.red_rose": "Red Rose",
"block.back_in_classic.shrub": "Shrub",
"block.back_in_classic.glowing_obsidian": "Red Obsidian",
"block.back_in_classic.dirt_slab": "Dirt Slab",
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/back_in_classic/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"key.back_in_classic.nether_portal_key": "Nether Portal Key",
"subtitles.waterfall": "Water Crashes",
"enchantment.back_in_classic.sharpshot": "Sharpshot",
"block.back_in_classic.blue_rose": "Cave Rose",
"block.back_in_classic.blue_rose": "Blue Rose",
"item.back_in_classic.plate_chestplate": "Plated Body",
"biome.back_in_classic.classic_plains": "Classic Plains",
"subtitles.ocean_loop": "Waves Crash",
Expand All @@ -49,7 +49,7 @@
"biome.back_in_classic.scenic_gravel_beach": "Scenic Sand Beach",
"item.back_in_classic.plate_boots": "Plated Boots",
"item.back_in_classic.fire": "Fire",
"block.back_in_classic.red_rose": "Wild Rose",
"block.back_in_classic.red_rose": "Red Rose",
"block.back_in_classic.shrub": "Shrub",
"block.back_in_classic.glowing_obsidian": "Red Obsidian",
"block.back_in_classic.dirt_slab": "Dirt Slab",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
{
"parent": "block/cube",
"parent": "block/slab_top",
"textures": {
"down": "back_in_classic:block/dirt",
"up": "back_in_classic:block/grass_top",
"north": "back_in_classic:block/grass_side",
"south": "back_in_classic:block/grass_side",
"east": "back_in_classic:block/grass_side",
"west": "back_in_classic:block/grass_side",
"particle": "back_in_classic:block/grass_top"
"bottom": "back_in_classic:block/grass_top",
"top": "back_in_classic:block/grass_top",
"side": "back_in_classic:block/grass_top"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "back_in_classic:crushed_gravel"
},
{
"type": "minecraft:alternatives",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.25,
0.35,
0.59,
1.0
]
}
],
"name": "minecraft:flint"
},
{
"type": "minecraft:item",
"name": "back_in_classic:crushed_gravel"
}
]
}
]
}
]
}
]
}
13 changes: 13 additions & 0 deletions src/main/resources/data/back_in_classic/recipes/blue_rose_dye.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"group": "back_in_classic",
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "back_in_classic:blue_rose_flower"
}
],
"result": {
"item": "minecraft:light_blue_dye",
"count": 1
}
}
29 changes: 29 additions & 0 deletions src/main/resources/data/back_in_classic/recipes/boat_craft.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"group": "back_in_classic",
"type": "minecraft:crafting_shaped",
"pattern": [
"0 2",
"345"
],
"key": {
"0": {
"item": "minecraft:stick"
},
"2": {
"item": "minecraft:stick"
},
"3": {
"tag": "minecraft:planks"
},
"4": {
"tag": "minecraft:planks"
},
"5": {
"tag": "minecraft:planks"
}
},
"result": {
"item": "back_in_classic:boat_item",
"count": 1
}
}
26 changes: 26 additions & 0 deletions src/main/resources/data/back_in_classic/recipes/chain_boots.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"group": "back_in_classic",
"type": "minecraft:crafting_shaped",
"pattern": [
"0 2",
"3 5"
],
"key": {
"0": {
"item": "back_in_classic:fire"
},
"2": {
"item": "back_in_classic:fire"
},
"3": {
"item": "back_in_classic:fire"
},
"5": {
"item": "back_in_classic:fire"
}
},
"result": {
"item": "minecraft:chainmail_boots",
"count": 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"group": "back_in_classic",
"type": "minecraft:crafting_shaped",
"pattern": [
"0 2",
"345",
"678"
],
"key": {
"0": {
"item": "back_in_classic:fire"
},
"2": {
"item": "back_in_classic:fire"
},
"3": {
"item": "back_in_classic:fire"
},
"4": {
"item": "back_in_classic:fire"
},
"5": {
"item": "back_in_classic:fire"
},
"6": {
"item": "back_in_classic:fire"
},
"7": {
"item": "back_in_classic:fire"
},
"8": {
"item": "back_in_classic:fire"
}
},
"result": {
"item": "minecraft:chainmail_chestplate",
"count": 1
}
}
29 changes: 29 additions & 0 deletions src/main/resources/data/back_in_classic/recipes/chain_helmet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"group": "back_in_classic",
"type": "minecraft:crafting_shaped",
"pattern": [
"012",
"3 5"
],
"key": {
"0": {
"item": "back_in_classic:fire"
},
"1": {
"item": "back_in_classic:fire"
},
"2": {
"item": "back_in_classic:fire"
},
"3": {
"item": "back_in_classic:fire"
},
"5": {
"item": "back_in_classic:fire"
}
},
"result": {
"item": "minecraft:chainmail_helmet",
"count": 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"group": "back_in_classic",
"type": "minecraft:crafting_shaped",
"pattern": [
"012",
"3 5",
"6 8"
],
"key": {
"0": {
"item": "back_in_classic:fire"
},
"1": {
"item": "back_in_classic:fire"
},
"2": {
"item": "back_in_classic:fire"
},
"3": {
"item": "back_in_classic:fire"
},
"5": {
"item": "back_in_classic:fire"
},
"6": {
"item": "back_in_classic:fire"
},
"8": {
"item": "back_in_classic:fire"
}
},
"result": {
"item": "minecraft:chainmail_leggings",
"count": 1
}
}
Loading

0 comments on commit d0fdc8a

Please sign in to comment.