Skip to content

Commit beb6738

Browse files
RealAntEngineerRealAntEngineer
committed
Merge remote-tracking branch 'origin/1.20.1-dev' into 1.20.1-dev
2 parents 8b6f428 + d986bca commit beb6738

File tree

191 files changed

+879
-27
lines changed

Some content is hidden

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

191 files changed

+879
-27
lines changed

‎gradlew‎

100644100755
File mode changed.

‎src/main/java/com/rae/creatingspace/init/CreativeModeTabsInit.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,14 @@ public class CreativeModeTabsInit {
127127
output.accept(BlockInit.RAW_COBALT_BLOCK);
128128
output.accept(BlockInit.MOON_ALUMINUM_ORE);
129129
output.accept(BlockInit.RAW_ALUMINUM_BLOCK);
130+
output.accept(BlockInit.ALUMINUM_BLOCK);
131+
output.accept(BlockInit.COBALT_BLOCK);
132+
output.accept(BlockInit.NICKEL_BLOCK);
133+
output.accept(BlockInit.COPRONICKEL_BLOCK);
134+
output.accept(BlockInit.HASTELLOY_BLOCK);
135+
output.accept(BlockInit.INCONEL_BLOCK);
136+
output.accept(BlockInit.MONEL_BLOCK);
137+
output.accept(BlockInit.REINFORCED_COPPER_BLOCK);
130138
//output.accept(FluidInit.CREATIVE_BUCKET_HYDROGEN);
131139
//output.accept(FluidInit.CREATIVE_BUCKET_OXYGEN);
132140
//output.accept(FluidInit.CREATIVE_BUCKET_METHANE);

‎src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,86 @@ public class BlockInit {
437437
.build()
438438
.register();
439439

440+
public static final BlockEntry<Block> ALUMINUM_BLOCK = REGISTRATE.block(
441+
"aluminum_block",Block::new)
442+
.initialProperties(()-> Blocks.IRON_BLOCK)
443+
.properties(p-> p.strength(1.0f).requiresCorrectToolForDrops())
444+
.tag(BlockTags.NEEDS_IRON_TOOL)
445+
.transform(TagGen.pickaxeOnly())
446+
.item()
447+
.build()
448+
.register();
449+
450+
public static final BlockEntry<Block> NICKEL_BLOCK = REGISTRATE.block(
451+
"nickel_block",Block::new)
452+
.initialProperties(()-> Blocks.IRON_BLOCK)
453+
.properties(p-> p.strength(1.0f).requiresCorrectToolForDrops())
454+
.tag(BlockTags.NEEDS_IRON_TOOL)
455+
.transform(TagGen.pickaxeOnly())
456+
.item()
457+
.build()
458+
.register();
459+
460+
public static final BlockEntry<Block> COBALT_BLOCK = REGISTRATE.block(
461+
"cobalt_block",Block::new)
462+
.initialProperties(()-> Blocks.IRON_BLOCK)
463+
.properties(p-> p.strength(1.0f).requiresCorrectToolForDrops())
464+
.tag(BlockTags.NEEDS_IRON_TOOL)
465+
.transform(TagGen.pickaxeOnly())
466+
.item()
467+
.build()
468+
.register();
469+
470+
public static final BlockEntry<Block> COPRONICKEL_BLOCK = REGISTRATE.block(
471+
"copronickel_block",Block::new)
472+
.initialProperties(()-> Blocks.IRON_BLOCK)
473+
.properties(p-> p.strength(1.0f).requiresCorrectToolForDrops())
474+
.tag(BlockTags.NEEDS_IRON_TOOL)
475+
.transform(TagGen.pickaxeOnly())
476+
.item()
477+
.build()
478+
.register();
479+
480+
public static final BlockEntry<Block> REINFORCED_COPPER_BLOCK = REGISTRATE.block(
481+
"reinforced_copper_block",Block::new)
482+
.initialProperties(()-> Blocks.IRON_BLOCK)
483+
.properties(p-> p.strength(1.0f).requiresCorrectToolForDrops())
484+
.tag(BlockTags.NEEDS_IRON_TOOL)
485+
.transform(TagGen.pickaxeOnly())
486+
.item()
487+
.build()
488+
.register();
489+
490+
public static final BlockEntry<Block> INCONEL_BLOCK = REGISTRATE.block(
491+
"inconel_block",Block::new)
492+
.initialProperties(()-> Blocks.IRON_BLOCK)
493+
.properties(p-> p.strength(1.0f).requiresCorrectToolForDrops())
494+
.tag(BlockTags.NEEDS_IRON_TOOL)
495+
.transform(TagGen.pickaxeOnly())
496+
.item()
497+
.build()
498+
.register();
499+
500+
public static final BlockEntry<Block> HASTELLOY_BLOCK = REGISTRATE.block(
501+
"hastelloy_block",Block::new)
502+
.initialProperties(()-> Blocks.IRON_BLOCK)
503+
.properties(p-> p.strength(1.0f).requiresCorrectToolForDrops())
504+
.tag(BlockTags.NEEDS_IRON_TOOL)
505+
.transform(TagGen.pickaxeOnly())
506+
.item()
507+
.build()
508+
.register();
509+
510+
public static final BlockEntry<Block> MONEL_BLOCK = REGISTRATE.block(
511+
"monel_block",Block::new)
512+
.initialProperties(()-> Blocks.IRON_BLOCK)
513+
.properties(p-> p.strength(1.0f).requiresCorrectToolForDrops())
514+
.tag(BlockTags.NEEDS_IRON_TOOL)
515+
.transform(TagGen.pickaxeOnly())
516+
.item()
517+
.build()
518+
.register();
519+
440520
//machinery
441521

442522
public static final BlockEntry<FreezerBlock> FREEZER_BLOCK = REGISTRATE.block(

‎src/main/resources/assets/creatingspace/blockstates/aluminum_block.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants" : {
3+
"": {
4+
"model" : "creatingspace:block/aluminum_block"
5+
}
6+
}
7+
}

‎src/main/resources/assets/creatingspace/blockstates/cobalt_block.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants" : {
3+
"": {
4+
"model" : "creatingspace:block/cobalt_block"
5+
}
6+
}
7+
}

‎src/main/resources/assets/creatingspace/blockstates/copronickel_block.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants" : {
3+
"": {
4+
"model" : "creatingspace:block/copronickel_block"
5+
}
6+
}
7+
}

‎src/main/resources/assets/creatingspace/blockstates/hastelloy_block.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants" : {
3+
"": {
4+
"model" : "creatingspace:block/hastelloy_block"
5+
}
6+
}
7+
}

‎src/main/resources/assets/creatingspace/blockstates/inconel_block.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants" : {
3+
"": {
4+
"model" : "creatingspace:block/inconel_block"
5+
}
6+
}
7+
}

‎src/main/resources/assets/creatingspace/blockstates/monel_block.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants" : {
3+
"": {
4+
"model" : "creatingspace:block/monel_block"
5+
}
6+
}
7+
}

‎src/main/resources/assets/creatingspace/blockstates/nickel_block.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants" : {
3+
"": {
4+
"model" : "creatingspace:block/nickel_block"
5+
}
6+
}
7+
}

0 commit comments

Comments
 (0)