Skip to content

Commit

Permalink
Updated some textures. Gonna need one of yall to add the blocks.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nieadni
Nieadni committed Aug 20, 2023
1 parent 7e1a91e commit 7e54999
Show file tree
Hide file tree
Showing 9 changed files with 992 additions and 2,120 deletions.
2,866 changes: 863 additions & 2,003 deletions run/logs/debug.log
View file

Large diffs are not rendered by default.

166 changes: 109 additions & 57 deletions run/logs/latest.log
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/generated/resources/.cache/2f147a10022ca79fcbaf184c9d793eff5d852abe
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-08-06T00:09:34.7101412 Block States: unordinary_basics
// 1.19.2 2023-08-20T11:51:31.9028531 Block States: unordinary_basics
7937ce5bb95898dfaacd70d381522d68e91c64f1 assets/unordinary_basics/blockstates/acacia_log.json
264f22adf7f7a536157833f1d40d08b4fa086ea6 assets/unordinary_basics/blockstates/acacia_log_slab.json
eb47aca8d7c91cc0e80ea5d951829262c125751a assets/unordinary_basics/blockstates/acacia_log_stairs.json
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-08-06T00:09:34.71915 LootTables
// 1.19.2 2023-08-20T11:51:31.8103769 LootTables
2d891dd38aebe5d06ea2a6b4c9a1533a97324ea2 data/unordinary_basics/loot_tables/blocks/acacia_log.json
fab1894dc8e69c683171e47b29a645e6e97cd770 data/unordinary_basics/loot_tables/blocks/acacia_log_slab.json
c5c5610df3573a30e467de223f0974f2a88fda06 data/unordinary_basics/loot_tables/blocks/acacia_log_stairs.json
Expand Down
53 changes: 0 additions & 53 deletions src/main/java/com/github/manasmods/unordinary_basics/block/Unordinary_BasicsBlocks.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.manasmods.unordinary_basics.block;

import com.github.manasmods.unordinary_basics.Unordinary_Basics;
import net.minecraft.world.level.block.Block;
import net.minecraftforge.registries.ObjectHolder;

Expand All @@ -13,58 +12,6 @@ public class Unordinary_BasicsBlocks {
@ObjectHolder(registryName = "block", value = "unordinary_basics:item_sorter")
public static final Block ITEM_SORTER = null;

@ObjectHolder(registryName = "block", value = "unordinary_basics:calcite_bricks")
public static final Block CALCITE_BRICKS = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:tuff_bricks")
public static final Block TUFF_BRICKS = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:polished_tuff")
public static final Block POLISHED_TUFF = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:dripstone_bricks")
public static final Block DRIPSTONE_BRICKS = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:soul_sandstone")
public static final Block SOUL_SANDSTONE = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:chiseled_soul_sandstone")
public static final Block CHISELLED_SOUL_SANDSTONE = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:cut_soul_sandstone")
public static final Block CUT_SOUL_SANDSTONE = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:smooth_soul_sandstone")
public static final Block SMOOTH_SOUL_SANDSTONE = null;

@ObjectHolder(registryName = "block", value = "unordinary_basics:calcite_bricks_slab")
public static final Block CALCITE_BRICK_SLAB = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:tuff_bricks_slab")
public static final Block TUFF_BRICK_SLAB = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:polished_tuff_slab")
public static final Block POLISHED_TUFF_SLAB = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:dripstone_bricks_slab")
public static final Block DRIPSTONE_BRICK_SLAB = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:soul_sandstone_slab")
public static final Block SOUL_SANDSTONE_SLAB = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:chiseled_soul_sandstone_slab")
public static final Block CHISELLED_SOUL_SANDSTONE_SLAB = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:cut_soul_sandstone_slab")
public static final Block CUT_SOUL_SANDSTONE_SLAB = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:smooth_soul_sandstone_slab")
public static final Block SMOOTH_SOUL_SANDSTONE_SLAB = null;

@ObjectHolder(registryName = "block", value = "unordinary_basics:calcite_bricks_stairs")
public static final Block CALCITE_BRICK_STAIRS = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:tuff_bricks_stairs")
public static final Block TUFF_BRICK_STAIRS = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:polished_tuff_stairs")
public static final Block POLISHED_TUFF_STAIRS = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:dripstone_bricks_stairs")
public static final Block DRIPSTONE_BRICK_STAIRS = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:soul_sandstone_stairs")
public static final Block SOUL_SANDSTONE_STAIRS = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:chiseled_soul_sandstone_stairs")
public static final Block CHISELLED_SOUL_SANDSTONE_STAIRS = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:cut_soul_sandstone_stairs")
public static final Block CUT_SOUL_SANDSTONE_STAIRS = null;
@ObjectHolder(registryName = "block", value = "unordinary_basics:smooth_soul_sandstone_stairs")
public static final Block SMOOTH_SOUL_SANDSTONE_STAIRS = null;


//STAIRS

@ObjectHolder(registryName = "block", value = "unordinary_basics:calcite_stairs")
Expand Down
2 changes: 0 additions & 2 deletions ...java/com/github/manasmods/unordinary_basics/data/Unordinary_BasicsBlockStateProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ protected void generate() {
}

private void modStairs() {

stairs(Unordinary_BasicsBlocks.CALCITE_STAIRS, Blocks.CALCITE);
stairs(Unordinary_BasicsBlocks.TUFF_STAIRS, Blocks.TUFF);
stairs(Unordinary_BasicsBlocks.DRIPSTONE_STAIRS, Blocks.DRIPSTONE_BLOCK);
Expand Down Expand Up @@ -182,7 +181,6 @@ private void modStairs() {
}

private void modSlabs() {

slab(Unordinary_BasicsBlocks.CALCITE_SLAB, Blocks.CALCITE);
slab(Unordinary_BasicsBlocks.TUFF_SLAB, Blocks.TUFF);
slab(Unordinary_BasicsBlocks.DRIPSTONE_SLAB, Blocks.DRIPSTONE_BLOCK);
Expand Down
21 changes: 18 additions & 3 deletions src/main/java/com/github/manasmods/unordinary_basics/registry/BlockRegistry.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
package com.github.manasmods.unordinary_basics.registry;

import com.github.manasmods.unordinary_basics.block.*;
import com.github.manasmods.unordinary_basics.block.DirtPathSlab;
import com.github.manasmods.unordinary_basics.block.DirtWiltableSlabBlock;
import com.github.manasmods.unordinary_basics.block.DirtWiltableStairBlock;
import com.github.manasmods.unordinary_basics.block.EnchantmentLibraryBlock;
import com.github.manasmods.unordinary_basics.block.FallingSlabBlock;
import com.github.manasmods.unordinary_basics.block.FallingStairBlock;
import com.github.manasmods.unordinary_basics.block.GrassSproutableSlabBlock;
import com.github.manasmods.unordinary_basics.block.GrassSproutableStairBlock;
import com.github.manasmods.unordinary_basics.block.ItemSorterBlock;
import com.github.manasmods.unordinary_basics.block.PathableSlabBlock;
import com.github.manasmods.unordinary_basics.block.PathableStairBlock;
import com.github.manasmods.unordinary_basics.block.SimpleBlock;
import com.github.manasmods.unordinary_basics.block.Unordinary_BasicsBlocks;
import com.github.manasmods.unordinary_basics.item.templates.CustomBlockItem;
import com.github.manasmods.unordinary_basics.item.templates.SimpleBlockItem;
import net.minecraft.network.chat.Component;
Expand All @@ -10,7 +22,11 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.*;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.SlabBlock;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.StairBlock;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.material.Material;
import net.minecraftforge.eventbus.api.IEventBus;
Expand Down Expand Up @@ -61,7 +77,6 @@ private static void registerBlocks(DeferredRegister<Block> registry) {
.noOcclusion()
.requiresCorrectToolForDrops()));


//BLOCKS FOR STAIRS + SLABS

RegistryObject<Block> oak_log = registry.register("oak_log", () -> new SimpleBlock(Material.WOOD, properties -> properties.strength(2.0F).sound(SoundType.WOOD).requiresCorrectToolForDrops()));
Expand Down
Binary file modified src/main/resources/assets/unordinary_basics/textures/gui/a_very_ordinary_book.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/unordinary_basics/textures/item/a_very_ordinary_book.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7e54999

Please sign in to comment.