Skip to content

Commit 0c79122

Browse files
WimpingegoWimpingego
committed
0.1.5
1 parent b392fb1 commit 0c79122

File tree

346 files changed

+4925
-2418
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

346 files changed

+4925
-2418
lines changed

‎gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
22
# This is required to provide enough memory for the Minecraft decompilation process.
3-
org.gradle.jvmargs=-Xmx4G
3+
org.gradle.jvmargs=-Xmx6G
44
org.gradle.daemon=false
55

6-
modVersion = 0.1.4
6+
modVersion = 0.1.5
77
modMinecraftVersion = 1.15.2
88
modForgeVersion = 31.1.78
99
mappingsChannel = snapshot

‎src/main/java/com/github/wimpingego/nnow/NNOW.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.github.wimpingego.nnow.util.Trollnventory;
1313
import com.github.wimpingego.nnow.util.WitherEvents;
1414
import com.github.wimpingego.nnow.util.ModConfigs;
15+
import com.github.wimpingego.nnow.util.PlayerSpecialAbilities;
1516
import com.github.wimpingego.nnow.villagers.PointOfInterestTypes;
1617
import com.github.wimpingego.nnow.villagers.VillagerUtil;
1718
import net.minecraft.item.BlockItem;
@@ -63,7 +64,7 @@ public NNOW()
6364
ModContainerTypes.CONTAINER_TYPES.register(modEventBus);
6465

6566
MinecraftForge.EVENT_BUS.register(this);
66-
MinecraftForge.EVENT_BUS.register(Trollnventory.class);
67+
//MinecraftForge.EVENT_BUS.register(Trollnventory.class);
6768

6869
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ModConfigs.COMMON_CONFIG);
6970
ModConfigs.load(ModConfigs.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve("nnow-common.toml"));
@@ -87,7 +88,11 @@ public static void createBlockItems(final RegistryEvent.Register<Item> event) {
8788
}
8889

8990
private void setup(final FMLCommonSetupEvent event)
91+
9092
{
93+
MinecraftForge.EVENT_BUS.register(new PlayerSpecialAbilities());
94+
MinecraftForge.EVENT_BUS.register(Trollnventory.class);
95+
9196
VillagerUtil.fixPOITypeBlockStates(PointOfInterestTypes.OLD_DERPY);
9297
VillagerUtil.fixPOITypeBlockStates(PointOfInterestTypes.BANKER);
9398
VillagerUtil.fixPOITypeBlockStates(PointOfInterestTypes.BEEKEEPER);

‎src/main/java/com/github/wimpingego/nnow/init/BlockList.java

+33-16
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,27 @@
11
package com.github.wimpingego.nnow.init;
22

33
import com.github.wimpingego.nnow.NNOW;
4-
import com.github.wimpingego.nnow.objects.blocks.AGSBlock;
4+
import com.github.wimpingego.nnow.objects.blocks.AGBlock;
55
import com.github.wimpingego.nnow.objects.blocks.BookshelfChestBlock;
66
import com.github.wimpingego.nnow.objects.blocks.BookshelfSlabBlock;
77
import com.github.wimpingego.nnow.objects.blocks.BookshelfStairsBlock;
88
import com.github.wimpingego.nnow.objects.blocks.CobbleGen;
9-
import com.github.wimpingego.nnow.objects.blocks.CustomStairsBlock;
109
import com.github.wimpingego.nnow.objects.blocks.DarkGlass;
1110
import com.github.wimpingego.nnow.objects.blocks.EndLantern;
1211
import com.github.wimpingego.nnow.objects.blocks.LavaWell;
12+
import com.github.wimpingego.nnow.objects.blocks.RedstoneGolemHead;
1313
import com.github.wimpingego.nnow.objects.blocks.SuperObsidian;
1414
import com.github.wimpingego.nnow.objects.blocks.SafeChestBlock;
1515
import com.github.wimpingego.nnow.objects.blocks.WaterWell;
1616
import com.github.wimpingego.nnow.objects.blocks.DoubleHighBlock;
17-
import com.github.wimpingego.nnow.objects.blocks.golem.RedstoneGolemHead;
17+
import com.github.wimpingego.nnow.objects.blocks.slabs.BirchSlab;
18+
import com.github.wimpingego.nnow.objects.blocks.slabs.GrassSlab;
19+
import com.github.wimpingego.nnow.objects.blocks.slabs.LeafSlab;
20+
import com.github.wimpingego.nnow.objects.blocks.slabs.SpruceSlab;
21+
import com.github.wimpingego.nnow.objects.blocks.stairs.BirchStairsBlock;
22+
import com.github.wimpingego.nnow.objects.blocks.stairs.CustomStairsBlock;
23+
import com.github.wimpingego.nnow.objects.blocks.stairs.LeafStairsBlock;
24+
import com.github.wimpingego.nnow.objects.blocks.stairs.SpruceStairsBlock;
1825
import com.github.wimpingego.nnow.objects.blocks.traps.TrapBlock;
1926
import com.github.wimpingego.nnow.objects.blocks.traps.TrapType;
2027
import com.github.wimpingego.nnow.objects.blocks.BeekeeperBlock;
@@ -46,24 +53,23 @@ public class BlockList {
4653
public static final DeferredRegister<Block> BLOCKS = new DeferredRegister<>(ForgeRegistries.BLOCKS,NNOW.MOD_ID);
4754

4855
//Traps
49-
5056
public static final RegistryObject<Block> TRAP_BLOCK = BLOCKS.register("trap_block",() -> new TrapBlock(Block.Properties.from(Blocks.IRON_BLOCK).harvestTool(ToolType.PICKAXE),TrapType.FAKE));
5157
public static final RegistryObject<Block> IRON_TRAP = BLOCKS.register("iron_trap",() -> new TrapBlock(Block.Properties.from(Blocks.IRON_BLOCK).harvestTool(ToolType.PICKAXE), TrapType.IRON));
5258
public static final RegistryObject<Block> GOLDERN_TRAP = BLOCKS.register("gold_trap",() -> new TrapBlock(Block.Properties.from(Blocks.IRON_BLOCK).harvestTool(ToolType.PICKAXE), TrapType.GOLD));
5359
public static final RegistryObject<Block> DIAMOND_TRAP = BLOCKS.register("diamond_trap",() -> new TrapBlock(Block.Properties.from(Blocks.IRON_BLOCK).harvestTool(ToolType.PICKAXE), TrapType.DIAMOND));
5460
public static final RegistryObject<Block> WITHER_TRAP = BLOCKS.register("wither_trap",() -> new TrapBlock(Block.Properties.from(Blocks.IRON_BLOCK).harvestTool(ToolType.PICKAXE), TrapType.WITHER));
5561

5662
//POI
57-
5863
public static final RegistryObject<Block> END_LANTERN = BLOCKS.register("end_lantern",() -> new EndLantern(Block.Properties.from(Blocks.LANTERN)));
5964
public static final RegistryObject<Block> SWORD_IN_STONE = BLOCKS.register("sword_in_stone",() -> new DoubleHighBlock(Block.Properties.from(Blocks.STONE)));
6065
public static final RegistryObject<Block> BEEKEEPER_BLOCK = BLOCKS.register("beekeeper_block",() -> new BeekeeperBlock<Object>(Block.Properties.from(Blocks.BOOKSHELF).lightValue(4).harvestTool(ToolType.AXE)));
6166
public static final RegistryObject<Block> SEA_FISHERMAN_POI = BLOCKS.register("sea_fisherman",() -> new DoubleHighBlock(Block.Properties.from(Blocks.IRON_BLOCK).harvestTool(ToolType.PICKAXE)));
6267
public static final RegistryObject<Block> SEA_TRADER_POI = BLOCKS.register("sea_trader",() -> new DoubleHighBlock(Block.Properties.from(Blocks.OAK_LOG).harvestTool(ToolType.AXE)));
6368

64-
public static final RegistryObject<Block> AGG_BLOCK = BLOCKS.register("agg_block",() -> new Block(Block.Properties.from(Blocks.GRAVEL)));
65-
public static final RegistryObject<Block> AGS_BLOCK = BLOCKS.register("ags_block",() -> new AGSBlock(Block.Properties.from(Blocks.SAND)));
66-
public static final RegistryObject<Block> AGRS_BLOCK = BLOCKS.register("agrs_block",() -> new AGSBlock(Block.Properties.from(Blocks.RED_SAND)));
69+
//Blocks
70+
public static final RegistryObject<Block> AGG_BLOCK = BLOCKS.register("agg_block",() -> new AGBlock(Block.Properties.from(Blocks.GRAVEL)));
71+
public static final RegistryObject<Block> AGS_BLOCK = BLOCKS.register("ags_block",() -> new AGBlock(Block.Properties.from(Blocks.SAND)));
72+
public static final RegistryObject<Block> AGRS_BLOCK = BLOCKS.register("agrs_block",() -> new AGBlock(Block.Properties.from(Blocks.RED_SAND)));
6773
public static final RegistryObject<Block> DARK_GLASS_BLOCK = BLOCKS.register("dark_glass_block",() -> new DarkGlass());
6874
public static final RegistryObject<Block> SUPER_OBSIDIAN = BLOCKS.register("super_obsidian",() -> new SuperObsidian());
6975
public static final RegistryObject<Block> SUPER_OBSIDIAN_BARS = BLOCKS.register("super_obsidian_bars",() -> new SuperObsidian());
@@ -73,38 +79,49 @@ public class BlockList {
7379
public static final RegistryObject<Block> COBBLEGEN = BLOCKS.register("cobblegen",() -> new CobbleGen(Block.Properties.from(Blocks.IRON_BLOCK).lightValue(4).harvestTool(ToolType.PICKAXE)));
7480

7581
//Stairs
76-
7782
public static final RegistryObject<Block> GRAVEL_STAIRS = BLOCKS.register("gravel_stairs",() -> new CustomStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.GRAVEL).harvestTool(ToolType.SHOVEL)));
7883
public static final RegistryObject<Block> SAND_STAIRS = BLOCKS.register("sand_stairs",() -> new CustomStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.SAND).harvestTool(ToolType.SHOVEL)));
7984
public static final RegistryObject<Block> REDSAND_STAIRS = BLOCKS.register("redsand_stairs",() -> new CustomStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.RED_SAND).harvestTool(ToolType.SHOVEL)));
8085
public static final RegistryObject<Block> COARSEDIRT_STAIRS = BLOCKS.register("coarsedirt_stairs",() -> new CustomStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.DIRT).harvestTool(ToolType.SHOVEL)));
8186
public static final RegistryObject<Block> DIRT_STAIRS = BLOCKS.register("dirt_stairs",() -> new CustomStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.DIRT).harvestTool(ToolType.SHOVEL)));
87+
public static final RegistryObject<Block> CRACKED_STONE_STAIRS = BLOCKS.register("cracked_stone_bricks_stairs",() -> new CustomStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.STONE).harvestTool(ToolType.PICKAXE)));
8288
public static final RegistryObject<Block> BOOKSHELF_STAIRS = BLOCKS.register("bookshelf_stairs",() -> new BookshelfStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.BOOKSHELF).harvestTool(ToolType.AXE)));
8389

84-
//Slabs
90+
public static final RegistryObject<Block> OAK_LEAVES_STAIRS = BLOCKS.register("oak_leaves_stairs",() -> new LeafStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.OAK_LEAVES)));
91+
public static final RegistryObject<Block> DARK_OAK_LEAVES_STAIRS = BLOCKS.register("dark_oak_leaves_stairs",() -> new LeafStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.DARK_OAK_LEAVES)));
92+
public static final RegistryObject<Block> JUNGLE_LEAVES_STAIRS = BLOCKS.register("jungle_leaves_stairs",() -> new LeafStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.JUNGLE_LEAVES)));
93+
public static final RegistryObject<Block> ACACIA_LEAVES_STAIRS = BLOCKS.register("acacia_leaves_stairs",() -> new LeafStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.ACACIA_LEAVES)));
94+
public static final RegistryObject<Block> SPRUCE_LEAVES_STAIRS = BLOCKS.register("spruce_leaves_stairs",() -> new SpruceStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.SPRUCE_LEAVES)));
95+
public static final RegistryObject<Block> BIRCH_LEAVES_STAIRS = BLOCKS.register("birch_leaves_stairs",() -> new BirchStairsBlock(AGS_BLOCK.get().getDefaultState(),Block.Properties.from(Blocks.BIRCH_LEAVES)));
8596

97+
//Slabs
98+
public static final RegistryObject<Block> GRASS_SLAB = BLOCKS.register("grass_slab",() -> new GrassSlab(Block.Properties.from(Blocks.GRASS_BLOCK).harvestTool(ToolType.SHOVEL)));
8699
public static final RegistryObject<Block> GRAVEL_SLAB = BLOCKS.register("gravel_slab",() -> new SlabBlock(Block.Properties.from(Blocks.GRAVEL).harvestTool(ToolType.SHOVEL)));
87100
public static final RegistryObject<Block> SAND_SLAB = BLOCKS.register("sand_slab",() -> new SlabBlock(Block.Properties.from(Blocks.SAND).harvestTool(ToolType.SHOVEL)));
88101
public static final RegistryObject<Block> REDSAND_SLAB = BLOCKS.register("redsand_slab",() -> new SlabBlock(Block.Properties.from(Blocks.RED_SAND).harvestTool(ToolType.SHOVEL)));
89102
public static final RegistryObject<Block> COARSEDIRT_SLAB = BLOCKS.register("coarsedirt_slab",() -> new SlabBlock(Block.Properties.from(Blocks.DIRT).harvestTool(ToolType.SHOVEL)));
90-
public static final RegistryObject<Block> DIRT_SLAB = BLOCKS.register("dirt_slab",() -> new SlabBlock(Block.Properties.from(Blocks.DIRT).harvestTool(ToolType.SHOVEL)));
91-
public static final RegistryObject<Block> BOOKSHELF_SLAB = BLOCKS.register("bookshelf_slab",() -> new BookshelfSlabBlock(AGS_BLOCK.get().getDefaultState(), Block.Properties.from(Blocks.BOOKSHELF).harvestTool(ToolType.AXE)));
103+
public static final RegistryObject<Block> DIRT_SLAB = BLOCKS.register("dirt_slab",() -> new SlabBlock(Block.Properties.from(Blocks.DIRT).harvestTool(ToolType.SHOVEL)));
104+
public static final RegistryObject<Block> CRACKED_STONE_SLAB = BLOCKS.register("cracked_stone_bricks_slab",() -> new SlabBlock(Block.Properties.from(Blocks.STONE).harvestTool(ToolType.PICKAXE)));
105+
public static final RegistryObject<Block> BOOKSHELF_SLAB = BLOCKS.register("bookshelf_slab",() -> new BookshelfSlabBlock(Block.Properties.from(Blocks.BOOKSHELF).harvestTool(ToolType.AXE)));
106+
107+
public static final RegistryObject<Block> OAK_LEAVES_SLAB = BLOCKS.register("oak_leaves_slab",() -> new LeafSlab(Block.Properties.from(Blocks.OAK_LEAVES)));
108+
public static final RegistryObject<Block> DARK_OAK_LEAVES_SLAB = BLOCKS.register("dark_oak_leaves_slab",() -> new LeafSlab(Block.Properties.from(Blocks.DARK_OAK_LEAVES)));
109+
public static final RegistryObject<Block> JUNGLE_LEAVES_SLAB = BLOCKS.register("jungle_leaves_slab",() -> new LeafSlab(Block.Properties.from(Blocks.JUNGLE_LEAVES)));
110+
public static final RegistryObject<Block> ACACIA_LEAVES_SLAB = BLOCKS.register("acacia_leaves_slab",() -> new LeafSlab(Block.Properties.from(Blocks.ACACIA_LEAVES)));
111+
public static final RegistryObject<Block> SPRUCE_LEAVES_SLAB = BLOCKS.register("spruce_leaves_slab",() -> new SpruceSlab(Block.Properties.from(Blocks.SPRUCE_LEAVES)));
112+
public static final RegistryObject<Block> BIRCH_LEAVES_SLAB = BLOCKS.register("birch_leaves_slab",() -> new BirchSlab(Block.Properties.from(Blocks.BIRCH_LEAVES)));
92113

93114
//Chests
94115
public static final RegistryObject<Block> BOOKSHELF_CHEST = BLOCKS.register("bookshelf_chest",() -> new BookshelfChestBlock(Block.Properties.from(Blocks.BOOKSHELF).hardnessAndResistance(2.5f, 600.0f).harvestTool(ToolType.AXE)));
95116
public static final RegistryObject<Block> SAFE_CHEST = BLOCKS.register("safe_chest",() -> new SafeChestBlock(Block.Properties.from(Blocks.IRON_BLOCK).hardnessAndResistance(2.5f, 600.0f).harvestTool(ToolType.PICKAXE)));
96117

97118
//Golem
98-
99119
public static final RegistryObject<Block> RSG_HEAD = BLOCKS.register("rsg_head",() -> new RedstoneGolemHead(Block.Properties.from(Blocks.STONE)));
100-
101120

102121
//No Item Blocks Info
103-
104122
public static final DeferredRegister<Block> NO_ITEM_BLOCK = new DeferredRegister<>(ForgeRegistries.BLOCKS, NNOW.MOD_ID);
105123

106124
//Bushes
107-
108125
public static final RegistryObject<Block> IRONBERRY_BUSH = NO_ITEM_BLOCK.register("iron_berry_bush",() -> new IronBerryBush(Block.Properties.from(Blocks.SWEET_BERRY_BUSH).tickRandomly()));
109126
public static final RegistryObject<Block> GOLDBERRY_BUSH = NO_ITEM_BLOCK.register("gold_berry_bush",() -> new GoldBerryBush(Block.Properties.from(Blocks.SWEET_BERRY_BUSH).tickRandomly()));
110127
public static final RegistryObject<Block> COALBERRY_BUSH = NO_ITEM_BLOCK.register("coal_berry_bush",() -> new CoalBerryBush(Block.Properties.from(Blocks.SWEET_BERRY_BUSH).tickRandomly()));

‎src/main/java/com/github/wimpingego/nnow/init/FoodList.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class FoodList {
1313
@SuppressWarnings("deprecation")
1414
public static final Food DEATH_POTATO = (new Food.Builder()).hunger(4).saturation(1.2F).effect(new EffectInstance(Effects.REGENERATION, 100, 0), 0.6F).effect(new EffectInstance(Effects.NAUSEA, 240, 1), 1.0F).setAlwaysEdible().build();
1515
@SuppressWarnings("deprecation")
16-
public static final Food WEETABIX = (new Food.Builder()).hunger(5).saturation(1.2F).effect(new EffectInstance(Effects.STRENGTH, 200, 0), 1.0F).setAlwaysEdible().build();
16+
public static final Food WEETABIX = (new Food.Builder()).hunger(5).saturation(1.2F).effect(new EffectInstance(Effects.STRENGTH, 600, 0), 1.0F).setAlwaysEdible().build();
1717

1818

1919
}

‎src/main/java/com/github/wimpingego/nnow/init/ItemList.java

+21
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,19 @@
77
import com.github.wimpingego.nnow.objects.items.Magnet;
88
import com.github.wimpingego.nnow.objects.items.PokingStick;
99
import com.github.wimpingego.nnow.objects.items.Viagra;
10+
import com.github.wimpingego.nnow.objects.items.armor.ItemCustomArmorTC;
1011
import com.github.wimpingego.nnow.objects.items.hammers.DiamondHammer;
1112
import com.github.wimpingego.nnow.objects.items.hammers.GoldenHammer;
1213
import com.github.wimpingego.nnow.objects.items.hammers.IronHammer;
1314
import com.github.wimpingego.nnow.objects.items.hammers.StoneHammer;
15+
import com.github.wimpingego.nnow.objects.items.shovel.DiamondSpade;
16+
import com.github.wimpingego.nnow.objects.items.shovel.GoldenSpade;
17+
import com.github.wimpingego.nnow.objects.items.shovel.IronSpade;
18+
import com.github.wimpingego.nnow.objects.items.shovel.StoneSpade;
19+
import com.github.wimpingego.nnow.util.enums.ModArmorMaterials;
1420

21+
import net.minecraft.inventory.EquipmentSlotType;
22+
import net.minecraft.item.ArmorItem;
1523
import net.minecraft.item.BlockItem;
1624
import net.minecraft.item.Item;
1725
import net.minecraft.item.ItemTier;
@@ -70,6 +78,11 @@ public class ItemList {
7078
public static final RegistryObject<Item> G_HAMMER = ITEMS.register("golden_hammer", () -> new GoldenHammer(ItemTier.GOLD, 7, -3.1f, new Item.Properties().group(NNOW.NNOW_TAB)));
7179
public static final RegistryObject<Item> D_HAMMER = ITEMS.register("diamond_hammer", () -> new DiamondHammer(ItemTier.DIAMOND, 6, -3.1f, new Item.Properties().group(NNOW.NNOW_TAB)));
7280

81+
public static final RegistryObject<Item> S_SPADE = ITEMS.register("stone_spade", () -> new StoneSpade(ItemTier.STONE, 1.5f, -3f, new Item.Properties().group(NNOW.NNOW_TAB)));
82+
public static final RegistryObject<Item> I_SPADE = ITEMS.register("iron_spade", () -> new IronSpade(ItemTier.IRON, 1.5f, -3f, new Item.Properties().group(NNOW.NNOW_TAB)));
83+
public static final RegistryObject<Item> G_SPADE = ITEMS.register("golden_spade", () -> new GoldenSpade(ItemTier.GOLD, 1.5f, -3f, new Item.Properties().group(NNOW.NNOW_TAB)));
84+
public static final RegistryObject<Item> D_SPADE = ITEMS.register("diamond_spade", () -> new DiamondSpade(ItemTier.DIAMOND, 1.5f, -3f, new Item.Properties().group(NNOW.NNOW_TAB)));
85+
7386
public static final RegistryObject<Item> POKING_STICK = ITEMS.register("poking_stick", () -> new PokingStick(new Item.Properties().group(NNOW.NNOW_TAB)));
7487
public static final RegistryObject<Item> MAGNET = ITEMS.register("magnet", () -> new Magnet(new Item.Properties().group(NNOW.NNOW_TAB)));
7588
public static final RegistryObject<Item> VIAGRA = ITEMS.register("viagra", () -> new Viagra(new Item.Properties().group(NNOW.NNOW_TAB)));
@@ -79,5 +92,13 @@ public class ItemList {
7992

8093
public static final RegistryObject<Item> DOOM_MUSIC_DISC = ITEMS.register("doom_disc", () -> new MusicDisc(1, SoundList.DOOM_DISC_LAZY.get(), new Item.Properties().maxStackSize(1).group(NNOW.NNOW_TAB)));
8194
public static final RegistryObject<Item> MIZZY_MUSIC_DISC = ITEMS.register("mizzy_disc", () -> new MusicDisc(2, SoundList.MIZZY_DISC_LAZY.get(), new Item.Properties().maxStackSize(1).group(NNOW.NNOW_TAB)));
95+
96+
//Armour
8297

98+
public static final RegistryObject<ArmorItem> LC_HELMET = ITEMS.register("clear_leather_helmet",() -> new ArmorItem(ModArmorMaterials.LC, EquipmentSlotType.HEAD, new Item.Properties().group(NNOW.NNOW_TAB)));
99+
public static final RegistryObject<ArmorItem> CC_HELMET = ITEMS.register("clear_chain_helmet",() -> new ArmorItem(ModArmorMaterials.CC, EquipmentSlotType.HEAD, new Item.Properties().group(NNOW.NNOW_TAB)));
100+
public static final RegistryObject<ArmorItem> IC_HELMET = ITEMS.register("clear_iron_helmet",() -> new ArmorItem(ModArmorMaterials.IC, EquipmentSlotType.HEAD, new Item.Properties().group(NNOW.NNOW_TAB)));
101+
public static final RegistryObject<ArmorItem> GC_HELMET = ITEMS.register("clear_golden_helmet",() -> new ArmorItem(ModArmorMaterials.GC, EquipmentSlotType.HEAD, new Item.Properties().group(NNOW.NNOW_TAB)));
102+
public static final RegistryObject<ArmorItem> DC_HELMET = ITEMS.register("clear_diamond_helmet",() -> new ArmorItem(ModArmorMaterials.DC, EquipmentSlotType.HEAD, new Item.Properties().group(NNOW.NNOW_TAB)));
103+
public static final RegistryObject<ArmorItem> TC_HELMET = ITEMS.register("clear_turtle_helmet",() -> new ItemCustomArmorTC(ModArmorMaterials.TC, EquipmentSlotType.HEAD, new Item.Properties().group(NNOW.NNOW_TAB)));
83104
}

‎src/main/java/com/github/wimpingego/nnow/objects/blocks/AGSBlock.java ‎src/main/java/com/github/wimpingego/nnow/objects/blocks/AGBlock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import net.minecraftforge.common.IPlantable;
1111
import net.minecraftforge.common.PlantType;
1212

13-
public class AGSBlock extends Block {
13+
public class AGBlock extends Block {
1414

15-
public AGSBlock(Properties properties) {
15+
public AGBlock(Properties properties) {
1616
super(properties);
1717
}
1818

‎src/main/java/com/github/wimpingego/nnow/objects/blocks/BookshelfSlabBlock.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class BookshelfSlabBlock extends SlabBlock
1313

1414
int value = ModConfigs.ENCHANT_POWER.get();
1515

16-
public BookshelfSlabBlock(BlockState state, Properties properties)
16+
public BookshelfSlabBlock(Properties properties)
1717
{
1818
super(properties);
1919
}

‎src/main/java/com/github/wimpingego/nnow/objects/blocks/ModPressurePlateBlock.java

-10
This file was deleted.

0 commit comments

Comments
 (0)