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

Commit

Permalink
Bug fixes with the crystals
Browse files Browse the repository at this point in the history
  • Loading branch information
Noah Jelen committed Jun 1, 2018
1 parent b4e57ce commit 2cab2fd
Show file tree
Hide file tree
Showing 25 changed files with 6,444 additions and 30,443 deletions.
2 changes: 2 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,5 @@
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
1.1.1:
Fixed a bug with diamond crystal generating in the deep void and 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
#Thu May 31 12:16:42 MST 2018
#Fri Jun 01 12:48:38 MST 2018
background=0xFFFFFF
memoryGood=0x78CB34
font=0x0
Expand Down
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.
35,575 changes: 6,293 additions & 29,282 deletions logs/debug.log

Large diffs are not rendered by default.

1,283 changes: 133 additions & 1,150 deletions logs/latest.log

Large diffs are not rendered by default.

Binary file modified saves/mod test/DIM-2/data/villages_du.dat
Binary file not shown.
Binary file modified saves/mod test/data/villages.dat
Binary file not shown.
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 modified saves/mod test/region/r.0.0.mca
Binary file not shown.
Binary file modified saves/mod test/session.lock
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/java/com/NetherNoah/ParadiseMod/Reference.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ public class Reference {
// Basic Mod Info
public static final String MOD_ID = "nnparadisemod";
public static final String NAME = "Nether Noah's Paradise Mod";
public static final String VERSION = "1.1 (The Resurrection Update)";
public static final String VERSION = "1.1.1 (The Resurrection Update)";
public static final String ACCEPTED_VERSIONS = "1.12.2";
public static int GUI_CUSTOM_WORKBENCH = 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public diamondCrystal() {
@Override
protected boolean canSustainBush(IBlockState state)
{
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;
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 @@ -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 emeraldCrystal() {
@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 @@ -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 quartzCrystal() {
@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 @@ -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 @@ -34,7 +35,7 @@ public redstoneCrystal() {
@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 @@ -2,6 +2,7 @@

import java.util.Random;

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

Expand Down Expand Up @@ -32,7 +33,7 @@ public rubyCrystal() {
@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 @@ -21,7 +21,6 @@
import net.minecraft.world.gen.structure.template.PlacementSettings;
import net.minecraft.world.gen.structure.template.Template;
import net.minecraft.world.gen.structure.template.TemplateManager;
import net.minecraftforge.fml.common.Mod;

public class RoseGen extends WorldGenerator {
@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mcmod.info
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"modid": "nnparadisemod",
"name": "Nether Noah's Paradise Mod",
"description": "This Mod adds stuff that makes minecraft better!\nBest if used alongside Quark!",
"version": "1.1 (The Resurrection Update)",
"version": "1.1.1 (The Resurrection Update)",
"logoFile": "assets/nnparadisemod/textures/nnparadisemod.png",
"url": "https://github.com/NoahJelen/nnparadisemod/tree/1.12.2",
"updateUrl": "",
Expand Down
2 changes: 1 addition & 1 deletion usercache.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"Player304","uuid":"2b98548a-5e09-3029-b082-b4c99d31d926","expiresOn":"2018-06-30 13:39:33 -0700"},{"name":"Player167","uuid":"6421d26c-b813-3e76-bed7-39f6f8e7da7e","expiresOn":"2018-06-30 10:42:31 -0700"},{"name":"Player723","uuid":"b77729bf-eef8-37d7-9aff-2a869ec2a3e6","expiresOn":"2018-06-30 17:06:32 -0700"},{"name":"Player482","uuid":"a692389e-9f43-3e66-84db-bbfe94bd70db","expiresOn":"2018-06-30 13:20:22 -0700"},{"name":"Player962","uuid":"7ef37f89-ec95-314c-ad83-8a71ac6e461c","expiresOn":"2018-06-29 18:02:53 -0700"},{"name":"Player955","uuid":"1b018a8a-d6f2-3b56-a2b7-8ff489be877f","expiresOn":"2018-06-30 13:01:43 -0700"},{"name":"Player656","uuid":"ea1dedcc-65ad-3e4c-bece-937c54b0cb65","expiresOn":"2018-06-29 14:46:54 -0700"},{"name":"Player699","uuid":"7a3400be-e31a-307d-9fe4-43aac536397b","expiresOn":"2018-06-30 16:26:46 -0700"},{"name":"AttieCat","uuid":"e0685ea5-7046-42a5-a2ba-8ba545af96da","expiresOn":"2018-06-30 18:19:03 -0700"},{"name":"Player47","uuid":"f913bf04-ecdf-3fde-8be0-ad7c513daf5c","expiresOn":"2018-06-30 11:53:02 -0700"},{"name":"Player813","uuid":"fb8576b0-fae6-3c1e-b44e-6422260d3c41","expiresOn":"2018-06-30 12:29:09 -0700"},{"name":"Player838","uuid":"3ebb1391-453f-3fbc-829d-8510c6e3c283","expiresOn":"2018-06-30 15:10:30 -0700"},{"name":"Player335","uuid":"168f5f60-1523-35b7-93b7-01b2c42226b4","expiresOn":"2018-06-30 16:15:14 -0700"},{"name":"Player939","uuid":"0704e0ba-eaf6-3b26-b880-53fd45ec3b48","expiresOn":"2018-06-29 14:25:44 -0700"},{"name":"Player40","uuid":"4ef2c8ae-f327-362c-9965-7aefe13435d8","expiresOn":"2018-06-29 14:44:53 -0700"},{"name":"Player996","uuid":"7e94e5c9-1ae4-352e-9cf6-8305e5b127c7","expiresOn":"2018-06-30 12:12:25 -0700"},{"name":"Player37","uuid":"dbef6173-b792-3041-821b-b11445f44ee8","expiresOn":"2018-06-30 16:40:44 -0700"},{"name":"Player567","uuid":"c645540e-52c6-36d2-bbbe-373fe1591946","expiresOn":"2018-06-28 18:00:39 -0700"},{"name":"Player348","uuid":"1ab04e7d-c966-3477-8a64-78d9a4421f72","expiresOn":"2018-06-30 10:58:57 -0700"},{"name":"Player296","uuid":"d60321ce-54ba-31e5-bac3-cbb6a732015a","expiresOn":"2018-06-30 12:09:54 -0700"},{"name":"Player726","uuid":"200cfba7-fcb9-3815-8a48-1783dd9d1668","expiresOn":"2018-06-30 19:24:42 -0700"},{"name":"Player971","uuid":"f948ac75-0055-3be3-bc2b-d97345a02022","expiresOn":"2018-06-30 19:15:58 -0700"},{"name":"NetherNoah777","uuid":"0feeede0-8b5d-404c-9b87-786aec5ef710","expiresOn":"2018-06-30 18:00:17 -0700"},{"name":"Logdotzip","uuid":"e2b531ac-2d76-4538-a3a4-ce477945daba","expiresOn":"2018-06-30 17:57:47 -0700"}]
[{"name":"Player375","uuid":"3bdd7bc1-57b3-3ed1-a14e-cc7341dec1b1","expiresOn":"2018-07-01 12:49:39 -0700"},{"name":"Player167","uuid":"6421d26c-b813-3e76-bed7-39f6f8e7da7e","expiresOn":"2018-06-30 10:42:31 -0700"},{"name":"Player955","uuid":"1b018a8a-d6f2-3b56-a2b7-8ff489be877f","expiresOn":"2018-06-30 13:01:43 -0700"},{"name":"Player47","uuid":"f913bf04-ecdf-3fde-8be0-ad7c513daf5c","expiresOn":"2018-06-30 11:53:02 -0700"},{"name":"Player939","uuid":"0704e0ba-eaf6-3b26-b880-53fd45ec3b48","expiresOn":"2018-06-29 14:25:44 -0700"},{"name":"Player567","uuid":"c645540e-52c6-36d2-bbbe-373fe1591946","expiresOn":"2018-06-28 18:00:39 -0700"},{"name":"Player971","uuid":"f948ac75-0055-3be3-bc2b-d97345a02022","expiresOn":"2018-06-30 19:15:58 -0700"},{"name":"NetherNoah777","uuid":"0feeede0-8b5d-404c-9b87-786aec5ef710","expiresOn":"2018-06-30 18:00:17 -0700"},{"name":"Player348","uuid":"1ab04e7d-c966-3477-8a64-78d9a4421f72","expiresOn":"2018-06-30 10:58:57 -0700"},{"name":"Player40","uuid":"4ef2c8ae-f327-362c-9965-7aefe13435d8","expiresOn":"2018-06-29 14:44:53 -0700"},{"name":"Player813","uuid":"fb8576b0-fae6-3c1e-b44e-6422260d3c41","expiresOn":"2018-06-30 12:29:09 -0700"},{"name":"Player656","uuid":"ea1dedcc-65ad-3e4c-bece-937c54b0cb65","expiresOn":"2018-06-29 14:46:54 -0700"},{"name":"Player723","uuid":"b77729bf-eef8-37d7-9aff-2a869ec2a3e6","expiresOn":"2018-06-30 17:06:32 -0700"},{"name":"Player304","uuid":"2b98548a-5e09-3029-b082-b4c99d31d926","expiresOn":"2018-06-30 13:39:33 -0700"},{"name":"Player962","uuid":"7ef37f89-ec95-314c-ad83-8a71ac6e461c","expiresOn":"2018-06-29 18:02:53 -0700"},{"name":"AttieCat","uuid":"e0685ea5-7046-42a5-a2ba-8ba545af96da","expiresOn":"2018-06-30 18:19:03 -0700"},{"name":"Player335","uuid":"168f5f60-1523-35b7-93b7-01b2c42226b4","expiresOn":"2018-06-30 16:15:14 -0700"},{"name":"Player37","uuid":"dbef6173-b792-3041-821b-b11445f44ee8","expiresOn":"2018-06-30 16:40:44 -0700"},{"name":"Player726","uuid":"200cfba7-fcb9-3815-8a48-1783dd9d1668","expiresOn":"2018-06-30 19:24:42 -0700"},{"name":"Logdotzip","uuid":"e2b531ac-2d76-4538-a3a4-ce477945daba","expiresOn":"2018-06-30 17:57:47 -0700"},{"name":"Player296","uuid":"d60321ce-54ba-31e5-bac3-cbb6a732015a","expiresOn":"2018-06-30 12:09:54 -0700"},{"name":"Player996","uuid":"7e94e5c9-1ae4-352e-9cf6-8305e5b127c7","expiresOn":"2018-06-30 12:12:25 -0700"},{"name":"Player838","uuid":"3ebb1391-453f-3fbc-829d-8510c6e3c283","expiresOn":"2018-06-30 15:10:30 -0700"},{"name":"Player699","uuid":"7a3400be-e31a-307d-9fe4-43aac536397b","expiresOn":"2018-06-30 16:26:46 -0700"},{"name":"Player482","uuid":"a692389e-9f43-3e66-84db-bbfe94bd70db","expiresOn":"2018-06-30 13:20:22 -0700"},{"name":"Player617","uuid":"99963b1e-252d-3ba6-8126-9071dd762e6c","expiresOn":"2018-07-01 12:47:11 -0700"}]
4 changes: 3 additions & 1 deletion usernamecache.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@
"f948ac75-0055-3be3-bc2b-d97345a02022": "Player971",
"200cfba7-fcb9-3815-8a48-1783dd9d1668": "Player726",
"6421d26c-b813-3e76-bed7-39f6f8e7da7e": "Player167",
"2b98548a-5e09-3029-b082-b4c99d31d926": "Player304"
"2b98548a-5e09-3029-b082-b4c99d31d926": "Player304",
"99963b1e-252d-3ba6-8126-9071dd762e6c": "Player617",
"3bdd7bc1-57b3-3ed1-a14e-cc7341dec1b1": "Player375"
}

0 comments on commit 2cab2fd

Please sign in to comment.