port 0.15 to forge

Author: cassiancc

common/src/main/java/cc/cassian/pyrite/Pyrite.java

@@ -1,5 +1,6 @@
 package cc.cassian.pyrite;
 
+import cc.cassian.pyrite.functions.ModHelpers;
 import net.minecraft.block.*;
 import net.minecraft.particle.DustParticleEffect;
 import net.minecraft.particle.ParticleTypes;
@@ -16,91 +17,113 @@ public class Pyrite {
 
 
     public static void init() {
-		//Framed Glass
+		// Framed Glass
 		createPyriteBlock("framed_glass","glass", 2.0f, MapColor.CLEAR, 0);
-		//Framed Glass Pane
+		// Framed Glass Pane
 		createPyriteBlock( "framed_glass_pane","glass_pane", 2.0f, MapColor.CLEAR, 0);
-		//Cobblestone Bricks
+		// Switchable Glass
+		createPyriteBlock("switchable_glass", "switchable_glass", Blocks.GLASS);
+		// Cobblestone Bricks
 		generateBrickSet("cobblestone_brick", Blocks.COBBLESTONE, MapColor.STONE_GRAY, 0);
-		//Mossy Cobblestone Bricks
+		// Mossy Cobblestone Bricks
 		generateBrickSet("mossy_cobblestone_brick", Blocks.MOSSY_COBBLESTONE, MapColor.STONE_GRAY, 0);
 		generateBrickSet("smooth_stone_brick", Blocks.COBBLESTONE, MapColor.STONE_GRAY, 0);
-		//Grass Set
+		// Grass Set
 		generateTurfSets();
-		//Nether Brick Fence Gate
+		// Nether Brick Fence Gate
 		createPyriteBlock("nether_brick_fence_gate","fence_gate", Blocks.NETHER_BRICK_FENCE);
-		//Resource Blocks
+		// Resource Blocks
 		generateResourceBlocks();
-		//Torch Levers
+		// Torch Levers
 		createTorchLever("torch_lever", Blocks.TORCH, ParticleTypes.FLAME);
 		createTorchLever("redstone_torch_lever", Blocks.SOUL_TORCH, DustParticleEffect.DEFAULT);
 		createTorchLever("soul_torch_lever", Blocks.TORCH, ParticleTypes.SOUL_FIRE_FLAME);
-		//Lamps
+		// Lamps
 		createPyriteBlock("lit_redstone_lamp", "block", Blocks.REDSTONE_LAMP, 15);
 		createPyriteBlock("glowstone_lamp","block", 0.3f, MapColor.YELLOW, 15);
-		//Classic Features
+		// Classic Features
 		createPyriteBlock("glowing_obsidian","obsidian", 50f, MapColor.RED, 15);
 		createPyriteBlock("nostalgia_glowing_obsidian","obsidian", 50f, MapColor.RED, 15);
 		createPyriteBlock("locked_chest", "facing", Blocks.CHEST, 15);
 		generateNostalgiaBlocks();
-		//Classic Flowers
+		// Classic Flowers
 		generateFlowers();
-		//Charred Nether Bricks
+		// Charred Nether Bricks
 		generateBrickSet("charred_nether_brick", Blocks.NETHER_BRICKS, MapColor.BLACK, 0);
-		//Blue Nether Bricks
+		// Blue Nether Bricks
 		generateBrickSet("blue_nether_brick", Blocks.NETHER_BRICKS, MapColor.BLUE, 0);
-		//Vanilla Crafting Tables
+		// Vanilla Crafting Tables
 		generateVanillaCraftingTables();
-		//Red Mushroom Blocks
+		// Modded Crafting Tables
+		if (ModHelpers.isModLoaded("aether")) {
+			createPyriteBlock("skyroot_crafting_table","crafting", Blocks.CRAFTING_TABLE);
+			createPyriteBlock( "holystone_wall_gate","fence_gate", Blocks.STONE);
+			createPyriteBlock( "mossy_holystone_wall_gate","fence_gate", Blocks.STONE);
+			createPyriteBlock( "holystone_brick_wall_gate","fence_gate", Blocks.STONE);
+			createPyriteBlock( "icestone_wall_gate","fence_gate", Blocks.STONE);
+			createPyriteBlock( "aerogel_wall_gate","fence_gate", Blocks.STONE);
+			createPyriteBlock( "carved_wall_gate","fence_gate", Blocks.STONE);
+			createPyriteBlock( "angelic_wall_gate","fence_gate", Blocks.STONE);
+			createPyriteBlock( "hellfire_wall_gate","fence_gate", Blocks.STONE);
+
+
+		}
+		// Red Mushroom Blocks
 		createPyriteBlock("red_mushroom_stem", "log", Blocks.MUSHROOM_STEM);
 		createWoodSet("red_mushroom", MapColor.RED, 0);
-		//Brown Mushroom Blocks
+		// Brown Mushroom Blocks
 		createPyriteBlock("brown_mushroom_stem", "log", Blocks.MUSHROOM_STEM);
 		createWoodSet("brown_mushroom", MapColor.BROWN, 0);
-		//Autogenerate dye blocks.
+		// Autogenerate dye blocks.
 		final String[] dyes = getDyes();
 		for (int dyeIndex = 0; dyeIndex < dyes.length; dyeIndex++) {
 			String dye = dyes[dyeIndex];
 			int blockLux = checkDyeLux(dye);
 			MapColor color = checkDyeMapColour(dye);
 			if (dyeIndex > 15) {
-				//Dye items.
+				// Dye items.
 				registerPyriteItem(dye + "_dye");
-				//Dyed Wool
+				// Dyed Wool
 				createPyriteBlock(dye + "_wool", "block", Blocks.WHITE_WOOL, color, blockLux);
-				//Terracotta Block
-				createPyriteBlock(dye+"_terracotta", "block", Blocks.TERRACOTTA,color, blockLux);
-
-				//Glazed Terracotta Block
-				//coming soon - createPyriteBlock(dye+"_glazed_terracotta", "block", Blocks.TERRACOTTA,color, blockLux);
-				//Concrete Powder Block
-				//coming soon - createPyriteBlock(dye+"_concrete", "block", Blocks.TERRACOTTA,color, blockLux);
-				//Concrete Block
-				//coming soon - createPyriteBlock(dye+"_concrete", "block", Blocks.CONCRETE,color, blockLux);
-				//Carpet block
+				// Dyed Carpet
 				createPyriteBlock(dye + "_carpet", "carpet", Blocks.WHITE_CARPET, color, blockLux);
+				// Dyed Concrete
+				createPyriteBlock(dye+"_concrete", "block", Blocks.WHITE_CONCRETE, color, blockLux);
+				// Dyed Concrete Powder
+				createPyriteBlock(dye+"_concrete_powder", "concrete_powder", Blocks.WHITE_CONCRETE_POWDER, color, blockLux);
 			}
-			//Planks and plank products
+			// Dyed Concrete Stairs
+			createPyriteBlock( dye+"_concrete_stairs", "stairs", Blocks.WHITE_CONCRETE, color, blockLux);
+			// Dyed Concrete Slab
+			createPyriteBlock( dye+"_concrete_slab", "slab", Blocks.WHITE_CONCRETE, color, blockLux);
+			//Dyed Planks and plank products
 			createWoodSet(dye + "_stained", color, blockLux);
-			//Bricks and brick products
+			// Dyed Bricks and brick products
 			generateBrickSet(dye + "_brick", Blocks.BRICKS, color, blockLux);
-			//Terracotta Bricks
+			if (dyeIndex > 15) {
+				// Dyed Terracotta
+				createPyriteBlock(dye+"_terracotta", "block", Blocks.TERRACOTTA,color, blockLux);
+				// Dyed Glazed Terracotta
+				//coming soon - createPyriteBlock(dye+"_glazed_terracotta", "block", Blocks.TERRACOTTA,color, blockLux);
+			}
+			// Dyed Terracotta Bricks
 			generateBrickSet(dye+"_terracotta_brick", Blocks.TERRACOTTA, color, blockLux);
-			//Dyed Framed Glass
+			// Dyed Torches
+			createTorch(dye+"_torch", getTorchParticle(dye));
+			// Dyed Lamps
+			createPyriteBlock(dye + "_lamp","block", 0.3f, color, 15);
+			// Dyed Framed Glass
 			createPyriteBlock(dye+"_framed_glass","tinted_glass", 2.0f, color, blockLux);
-			//Dyed Framed Glass Pane
+			// Dyed Framed Glass Pane
 			createPyriteBlock( dye+"_framed_glass_pane","tinted_glass_pane", 2.0f, color, blockLux);
-			//Dyed Lamps
-			createPyriteBlock(dye + "_lamp","block", 0.3f, color, 15);
-			//Dyed Torches
-			createTorch(dye+"_torch", getTorchParticle(dye));
-			//Dyed Torch Levers
+			// Dyed Torch Levers
 			createTorchLever(dye+"_torch_lever", Blocks.TORCH, getTorchParticle(dye));
 
 
 
+
 		}
-		//Autogenerate Wall Gates
+		// Autogenerate Wall Gates
 		for (Block wallsBlock : getVanillaWalls()) {
 			//Find block ID
 			String block = findVanillaBlockID(wallsBlock);
@@ -111,8 +134,6 @@ public static void init() {
 			//Create block.
 			createPyriteBlock(block + "_gate","fence_gate", wallsBlock);
 		}
-		register();
-
 	}
 
 

common/src/main/java/cc/cassian/pyrite/blocks/ModCraftingScreenHandler.java

@@ -1,7 +1,6 @@
 package cc.cassian.pyrite.blocks;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.screen.CraftingScreenHandler;

common/src/main/java/cc/cassian/pyrite/blocks/ModCraftingTable.java

@@ -3,14 +3,12 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.CraftingTableBlock;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.screen.CraftingScreenHandler;
 import net.minecraft.screen.NamedScreenHandlerFactory;
 import net.minecraft.screen.ScreenHandlerContext;
 import net.minecraft.screen.SimpleNamedScreenHandlerFactory;
 import net.minecraft.stat.Stats;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
-import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -21,14 +19,15 @@ public class ModCraftingTable extends CraftingTableBlock {
     public ModCraftingTable(Settings settings) {
         super(settings);
     }
-    @Override
-    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+
+    protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
         if (world.isClient) {
             return ActionResult.SUCCESS;
+        } else {
+            player.openHandledScreen(state.createScreenHandlerFactory(world, pos));
+            player.incrementStat(Stats.INTERACT_WITH_CRAFTING_TABLE);
+            return ActionResult.CONSUME;
         }
-        player.openHandledScreen(state.createScreenHandlerFactory(world, pos));
-        player.incrementStat(Stats.INTERACT_WITH_CRAFTING_TABLE);
-        return ActionResult.CONSUME;
     }
 
     @Override

common/src/main/java/cc/cassian/pyrite/blocks/ModFacingBlock.java

@@ -1,5 +1,6 @@
 package cc.cassian.pyrite.blocks;
 
+import com.mojang.serialization.MapCodec;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.HorizontalFacingBlock;
@@ -20,6 +21,7 @@ public ModFacingBlock(Settings settings) {
         this.power = 0;
 
     }
+
     public ModFacingBlock(Settings settings, int power) {
         super(settings);
         this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH));

common/src/main/java/cc/cassian/pyrite/blocks/ModGlass.java

@@ -1,8 +1,8 @@
 package cc.cassian.pyrite.blocks;
 
-import net.minecraft.block.GlassBlock;
+import net.minecraft.block.TransparentBlock;
 
-public class ModGlass extends GlassBlock {
+public class ModGlass extends TransparentBlock {
     public ModGlass(Settings settings) {
         super (settings.nonOpaque());
     }

common/src/main/java/cc/cassian/pyrite/blocks/ModPillar.java

@@ -1,6 +1,5 @@
 package cc.cassian.pyrite.blocks;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.PillarBlock;
 import net.minecraft.util.math.BlockPos;

common/src/main/java/cc/cassian/pyrite/blocks/ModTorch.java

@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
+import com.mojang.serialization.MapCodec;
 import net.minecraft.block.*;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
@@ -84,6 +85,7 @@ public void randomDisplayTick(BlockState state, World world, BlockPos pos, Rando
         world.addParticle(ParticleTypes.SMOKE, xPlus, yPlus, zPlus, 0.0, 0.0, 0.0);
         world.addParticle(particle, xPlus, yPlus, zPlus, 0.0, 0.0, 0.0);
     }
+
     public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
         return canPlaceAt(world, pos, getDirection(state).getOpposite());
     }

common/src/main/java/cc/cassian/pyrite/blocks/ModWall.java

@@ -1,6 +1,5 @@
 package cc.cassian.pyrite.blocks;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.WallBlock;
 import net.minecraft.util.math.BlockPos;

common/src/main/java/cc/cassian/pyrite/blocks/SwitchableGlass.java

@@ -0,0 +1,74 @@
+package cc.cassian.pyrite.blocks;
+
+import com.mojang.serialization.MapCodec;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.TransparentBlock;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.state.StateManager;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.random.Random;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
+
+public class SwitchableGlass extends TransparentBlock {
+    public static final BooleanProperty POWERED;
+
+    public SwitchableGlass(Settings settings) {
+        super(settings);
+        this.setDefaultState(this.getDefaultState().with(POWERED, false));
+
+    }
+
+    public float getAmbientOcclusionLightLevel(BlockState state, BlockView world, BlockPos pos) {
+        if (state.get(POWERED)) {
+            return 0F;
+        }
+        else {
+            return 1F;
+        }
+    }
+
+    public int getOpacity(BlockState state, BlockView world, BlockPos pos) {
+        if (state.get(POWERED)) {
+            return world.getMaxLightLevel();
+        }
+        return 0;
+    }
+
+    @Nullable
+    public BlockState getPlacementState(ItemPlacementContext ctx) {
+        return this.getDefaultState().with(POWERED, ctx.getWorld().isReceivingRedstonePower(ctx.getBlockPos()));
+    }
+
+    public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) {
+        if (!world.isClient) {
+            boolean currentlyPowered = state.get(POWERED);
+            if (currentlyPowered != world.isReceivingRedstonePower(pos)) {
+                if (currentlyPowered) {
+                    world.scheduleBlockTick(pos, this, 4);
+                } else {
+                    world.setBlockState(pos, state.cycle(POWERED), 2);
+                }
+            }
+        }
+    }
+
+    public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {
+        if (state.get(POWERED) && !world.isReceivingRedstonePower(pos)) {
+            world.setBlockState(pos, state.cycle(POWERED), 2);
+        }
+    }
+
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(POWERED);
+    }
+
+    static {
+        POWERED = Properties.POWERED;
+    }
+}