Skip to content
This repository has been archived by the owner on Aug 22, 2019. It is now read-only.

Commit

Permalink
Finally finished!
Browse files Browse the repository at this point in the history
  • Loading branch information
Noah Jelen committed May 31, 2018
1 parent b424e41 commit b4e57ce
Show file tree
Hide file tree
Showing 103 changed files with 32,382 additions and 994 deletions.
9 changes: 9 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,12 @@
Brick Pyramids are no longer limited to ocean biomes
The mod now shows its newest version
The version of my mod now ships with the resource pack by default
Added more advancements

1.1 (Resurrection Update):
Fixed some bugs with pick-blocking the doors
Added recipe for void furnace
Gave Regeneration Stone, Void Pearl, Void Pearl Block, and Void Pearl Ore display names
Added Player Head Temples and Giant Grass Blocks (must be enabled from the config)
Crystals can no longer generate on top of liquids
Improved world generation in the Deep Underground
2 changes: 1 addition & 1 deletion config/splash.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Splash screen properties
#Tue May 29 17:26:30 MST 2018
#Thu May 31 12:16:42 MST 2018
background=0xFFFFFF
memoryGood=0x78CB34
font=0x0
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
����
coordinate fingerprintssymbolic-names
classifierselfccallovrdselfmovrpovrmstaticsctor

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified logs/debug-1.log.gz
Binary file not shown.
Binary file modified logs/debug-2.log.gz
Binary file not shown.
Binary file modified logs/debug-3.log.gz
Binary file not shown.
Binary file modified logs/debug-4.log.gz
Binary file not shown.
Binary file modified logs/debug-5.log.gz
Binary file not shown.
30,173 changes: 29,372 additions & 801 deletions logs/debug.log

Large diffs are not rendered by default.

1,338 changes: 1,242 additions & 96 deletions logs/latest.log

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fullscreen:false
enableVsync:true
useVbo:true
hideServerAddress:false
advancedItemTooltips:false
advancedItemTooltips:true
pauseOnLostFocus:true
touchscreen:false
overrideWidth:0
Expand Down
Binary file removed saves/mod test/DIM-1/data/Fortress.dat
Binary file not shown.
Binary file modified saves/mod test/DIM-1/data/villages_nether.dat
Binary file not shown.
Binary file removed saves/mod test/DIM-1/region/r.-1.-1.mca
Binary file not shown.
Binary file removed saves/mod test/DIM-1/region/r.-1.0.mca
Binary file not shown.
Binary file removed saves/mod test/DIM-1/region/r.0.-1.mca
Binary file not shown.
Binary file removed saves/mod test/DIM-1/region/r.0.-2.mca
Binary file not shown.
Binary file removed saves/mod test/DIM-1/region/r.0.0.mca
Binary file not shown.
Binary file modified saves/mod test/DIM-2/data/villages_du.dat
Binary file not shown.
Binary file modified saves/mod test/DIM-3/data/villages_dv.dat
Binary file not shown.
Binary file modified saves/mod test/data/Mineshaft.dat
Binary file not shown.
Binary file modified saves/mod test/data/villages.dat
Binary file not shown.
Binary file modified saves/mod test/icon.png
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 saves/mod test/level.dat
Binary file not shown.
Binary file modified saves/mod test/level.dat_old
Binary file not shown.
Binary file removed saves/mod test/region/r.-1.-1.mca
Binary file not shown.
Binary file removed saves/mod test/region/r.-1.0.mca
Binary file not shown.
Binary file removed saves/mod test/region/r.0.-1.mca
Binary file not shown.
Binary file modified saves/mod test/region/r.0.0.mca
Binary file not shown.
Binary file removed saves/mod test/region/r.1.0.mca
Binary file not shown.
Binary file modified saves/mod test/session.lock
Binary file not shown.
Binary file added screenshots/2018-05-30_11.13.53.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/2018-05-30_11.13.56.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions src/main/java/com/NetherNoah/ParadiseMod/ParadiseMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import com.NetherNoah.ParadiseMod.world.worldgen.ores.OreGenOverworld;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.BrickPyramid;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.Buoy;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.GiantGrassBlock;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.Home;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.LandMine;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.LandMineDirt;
Expand All @@ -50,6 +51,7 @@
import com.NetherNoah.ParadiseMod.world.worldgen.structures.Minerbase;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.MiniStronghold;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.Ocean;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.PlayerTemples;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.RoguePortal;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.Runway;
import com.NetherNoah.ParadiseMod.world.worldgen.structures.SkyWheel;
Expand Down Expand Up @@ -126,7 +128,6 @@ public void preInit(FMLPreInitializationEvent event) {
Blocks.CHAIN_COMMAND_BLOCK.setCreativeTab(CreativeTabs.REDSTONE);
Blocks.BARRIER.setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
Blocks.MOB_SPAWNER.setCreativeTab(CreativeTabs.DECORATIONS);

//liquids
LiquidRedstone.register();
FluidRegistry.addBucketForFluid(LiquidRedstone.FluidLiquidRedstone.instance);
Expand Down Expand Up @@ -164,6 +165,8 @@ public void preInit(FMLPreInitializationEvent event) {
new VoidDungeonLarge(),
new VoidDungeon(),
new VoidTower(),
new PlayerTemples(),
new GiantGrassBlock(),

//created by AttieCat
new Shrine(),
Expand Down Expand Up @@ -219,7 +222,7 @@ public void Init(FMLInitializationEvent event) {

ModSmelting.register();

DimensionRegistry.MainRegistry();
DimensionRegistry.registerDimensions();

//spawn mobs in the deep void dimension
EntityRegistry.addSpawn(EntityZombie.class, 10, 0, 10, EnumCreatureType.MONSTER, Biomes.VOID);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.Random;

import com.NetherNoah.ParadiseMod.init.LiquidRedstone.BlockLiquidRedstone;
import com.NetherNoah.ParadiseMod.init.ModBlocks.Crystals;

import net.minecraft.block.BlockBush;
Expand Down Expand Up @@ -32,7 +33,7 @@ public diamondCrystal() {
@Override
protected boolean canSustainBush(IBlockState state)
{
return state.getBlock() != Blocks.AIR;
return state.getBlock() != Blocks.AIR||state.getBlock() != Blocks.WATER||state.getBlock() != Blocks.FLOWING_WATER||state.getBlock() != Blocks.LAVA||state.getBlock() != Blocks.FLOWING_LAVA||state.getBlock() !=BlockLiquidRedstone.instance;
}
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
import net.minecraft.block.BlockDoor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;

public class AndesiteDoor extends BlockDoor {
public AndesiteDoor() {
Expand All @@ -19,10 +24,17 @@ public AndesiteDoor() {
setResistance(10F);
setHarvestLevel("pickaxe", 0);
}

//the item is the door itself
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune)
{
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemAndesiteDoor;
}

@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
return new ItemStack(DoorItems.ItemAndesiteDoor);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
import net.minecraft.block.BlockDoor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;

public class BedrockDoor extends BlockDoor {
public BedrockDoor() {
Expand All @@ -25,4 +30,10 @@ public Item getItemDropped(IBlockState state, Random rand, int fortune)
{
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemBedrockDoor;
}

@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
return new ItemStack(DoorItems.ItemBedrockDoor);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;

public class CactusDoor extends BlockDoor {
public CactusDoor() {
Expand All @@ -24,6 +29,12 @@ public CactusDoor() {
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune)
{
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemCactusDoor;
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemCactusDoor;
}

@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
return new ItemStack(DoorItems.ItemCactusDoor);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
import net.minecraft.block.BlockDoor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;

public class CobblestoneDoor extends BlockDoor {
public CobblestoneDoor() {
Expand All @@ -22,6 +27,12 @@ public CobblestoneDoor() {
// the item is the door itself
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemCobblestoneDoor;
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemCobblestoneDoor;
}

@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
return new ItemStack(DoorItems.ItemCobblestoneDoor);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;

public class DiamondDoor extends BlockDoor {
public DiamondDoor() {
Expand All @@ -24,6 +29,12 @@ public DiamondDoor() {
// the item is the door itself
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemDiamondDoor;
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemDiamondDoor;
}

@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
return new ItemStack(DoorItems.ItemDiamondDoor);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
import net.minecraft.block.BlockDoor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;

public class DioriteDoor extends BlockDoor {
public DioriteDoor() {
Expand All @@ -23,6 +28,12 @@ public DioriteDoor() {
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune)
{
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemDioriteDoor;
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemDioriteDoor;
}

@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
return new ItemStack(DoorItems.ItemDioriteDoor);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;

public class EmeraldDoor extends BlockDoor {
public EmeraldDoor() {
Expand All @@ -21,6 +26,11 @@ public EmeraldDoor() {
setHarvestLevel("pickaxe", 2);
setSoundType(SoundType.METAL);
}
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
return new ItemStack(DoorItems.ItemEmeraldDoor);
}
private int getCloseSound()
{
return this.blockMaterial == Material.WOOD ? 1011 : 1012;
Expand All @@ -32,6 +42,6 @@ private int getOpenSound()
// the item is the door itself
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemEmeraldDoor;
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemEmeraldDoor;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
import net.minecraft.block.BlockDoor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;

public class EndDoor extends BlockDoor {
public EndDoor() {
Expand All @@ -22,6 +27,11 @@ public EndDoor() {
// the item is the door itself
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemEndDoor;
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR :DoorItems.ItemEndDoor;
}
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
return new ItemStack(DoorItems.ItemEndDoor);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;

public class GlassDoor extends BlockDoor {
public GlassDoor() {
Expand All @@ -25,4 +30,10 @@ public GlassDoor() {
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemGlassDoor;
}

@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
return new ItemStack(DoorItems.ItemGlassDoor);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
import net.minecraft.block.BlockDoor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;

public class GlowingObsidianDoor extends BlockDoor {
public GlowingObsidianDoor() {
Expand All @@ -25,4 +30,10 @@ public GlowingObsidianDoor() {
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : DoorItems.ItemGlowingObsidianDoor;
}

@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
return new ItemStack(DoorItems.ItemGlowingObsidianDoor);
}
}
Loading

0 comments on commit b4e57ce

Please sign in to comment.