diff --git a/1.11/banned-ips.json b/1.11/banned-ips.json new file mode 100644 index 00000000..0637a088 --- /dev/null +++ b/1.11/banned-ips.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/1.11/banned-players.json b/1.11/banned-players.json new file mode 100644 index 00000000..0637a088 --- /dev/null +++ b/1.11/banned-players.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/1.11/e_particle.png b/1.11/e_particle.png deleted file mode 100644 index e557878f..00000000 Binary files a/1.11/e_particle.png and /dev/null differ diff --git a/1.11/e_texture.png b/1.11/e_texture.png deleted file mode 100644 index 7291f2ea..00000000 Binary files a/1.11/e_texture.png and /dev/null differ diff --git a/1.11/eula.txt b/1.11/eula.txt index 5008bdeb..55682a3a 100644 --- a/1.11/eula.txt +++ b/1.11/eula.txt @@ -1,3 +1,3 @@ #By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). #Sat Apr 01 13:44:13 EDT 2017 -eula=false +eula=true diff --git a/1.11/ops.json b/1.11/ops.json new file mode 100644 index 00000000..0637a088 --- /dev/null +++ b/1.11/ops.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/1.11/server.properties b/1.11/server.properties index e4035a0c..e5b83885 100644 --- a/1.11/server.properties +++ b/1.11/server.properties @@ -1,2 +1,38 @@ #Minecraft server properties -#Mon Feb 13 22:08:20 EST 2017 +#Tue Apr 04 17:37:36 EDT 2017 +max-tick-time=60000 +generator-settings= +allow-nether=true +force-gamemode=false +gamemode=0 +enable-query=false +player-idle-timeout=0 +difficulty=1 +spawn-monsters=true +op-permission-level=4 +announce-player-achievements=true +pvp=true +snooper-enabled=true +level-type=DEFAULT +hardcore=false +enable-command-block=false +max-players=20 +network-compression-threshold=256 +resource-pack-sha1= +max-world-size=29999984 +server-port=25565 +server-ip= +spawn-npcs=true +allow-flight=false +level-name=world +view-distance=10 +resource-pack= +spawn-animals=true +white-list=false +generate-structures=true +online-mode=true +max-build-height=256 +level-seed= +prevent-proxy-connections=false +motd=A Minecraft Server +enable-rcon=false diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 3d988fd1..aaf21c4f 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -79,45 +79,14 @@ public class ModItems { ironhoe = new CustomHoe("ironhoe", ModMaterials.TOOL_WROUGHT_IRON); ironsword = new CustomSword("ironsword", ModMaterials.TOOL_WROUGHT_IRON); - //ironingotballcool = new BaseMultiItem("ironingotcool") {}; - //test = new ItemTest("ironsword"); + matchlockmusket = new Musket("matchlock_musket"); ironingotballhot = new BaseMultiItem("ironingothot", ModMaterials.TOOL_WROUGHT_IRON); ironchunkhot = new BaseMultiItem("ironchunkhot", ModMaterials.TOOL_WROUGHT_IRON); - /*ironingotballhot = new BaseMultiItem("ironingothot", ModMaterials.TOOL_WROUGHT_IRON) { - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - if(!world.isRemote) { - ItemStack itemstack = player.getHeldItem(hand); - if (world.getBlockState(pos).getBlock() != ModBlocks.firebox) { - BlockPos tempPos = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ()); - if(world.getBlockState(tempPos).getBlock() == Blocks.AIR){ - world.setBlockState(tempPos, ModBlocks.ironball.getDefaultState().withProperty(IngotBall.ACTIVE, true), 3); - itemstack.shrink(1); - return EnumActionResult.SUCCESS; - } - } - } - return EnumActionResult.FAIL; - } - }; - ironchunkhot = new BaseMultiItem("ironchunkhot", ModMaterials.TOOL_WROUGHT_IRON) { - public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - if(!world.isRemote) { - ItemStack itemstack = player.getHeldItem(hand); - if (world.getBlockState(pos).getBlock() != ModBlocks.firebox) { - BlockPos tempPos = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ()); - if(world.getBlockState(tempPos).getBlock() == Blocks.AIR){ - world.setBlockState(tempPos, ModBlocks.ironchunk.getDefaultState().withProperty(IngotBall.ACTIVE, true), 3); - itemstack.shrink(1); - return EnumActionResult.SUCCESS; - } - } - } - return EnumActionResult.FAIL; - } - };*/ + //forgingmanual = new ItemForgingManual(); + //test = new ItemTest("ironsword"); } public static void register() { diff --git a/1.11/whitelist.json b/1.11/whitelist.json new file mode 100644 index 00000000..0637a088 --- /dev/null +++ b/1.11/whitelist.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/1.11/world/DIM-1/data/capabilities.dat b/1.11/world/DIM-1/data/capabilities.dat new file mode 100644 index 00000000..e870d352 Binary files /dev/null and b/1.11/world/DIM-1/data/capabilities.dat differ diff --git a/1.11/world/DIM-1/data/villages_nether.dat b/1.11/world/DIM-1/data/villages_nether.dat new file mode 100644 index 00000000..21748faa Binary files /dev/null and b/1.11/world/DIM-1/data/villages_nether.dat differ diff --git a/1.11/world/DIM-1/forcedchunks.dat b/1.11/world/DIM-1/forcedchunks.dat new file mode 100644 index 00000000..e4345475 Binary files /dev/null and b/1.11/world/DIM-1/forcedchunks.dat differ diff --git a/1.11/world/DIM1/data/capabilities.dat b/1.11/world/DIM1/data/capabilities.dat new file mode 100644 index 00000000..e870d352 Binary files /dev/null and b/1.11/world/DIM1/data/capabilities.dat differ diff --git a/1.11/world/DIM1/data/villages_end.dat b/1.11/world/DIM1/data/villages_end.dat new file mode 100644 index 00000000..21748faa Binary files /dev/null and b/1.11/world/DIM1/data/villages_end.dat differ diff --git a/1.11/world/DIM1/forcedchunks.dat b/1.11/world/DIM1/forcedchunks.dat new file mode 100644 index 00000000..e4345475 Binary files /dev/null and b/1.11/world/DIM1/forcedchunks.dat differ diff --git a/1.11/world/data/Village.dat b/1.11/world/data/Village.dat new file mode 100644 index 00000000..a04538a2 Binary files /dev/null and b/1.11/world/data/Village.dat differ diff --git a/1.11/world/data/capabilities.dat b/1.11/world/data/capabilities.dat new file mode 100644 index 00000000..e870d352 Binary files /dev/null and b/1.11/world/data/capabilities.dat differ diff --git a/1.11/world/data/villages.dat b/1.11/world/data/villages.dat new file mode 100644 index 00000000..21748faa Binary files /dev/null and b/1.11/world/data/villages.dat differ diff --git a/1.11/world/forcedchunks.dat b/1.11/world/forcedchunks.dat new file mode 100644 index 00000000..e4345475 Binary files /dev/null and b/1.11/world/forcedchunks.dat differ diff --git a/1.11/world/level.dat b/1.11/world/level.dat new file mode 100644 index 00000000..770eca97 Binary files /dev/null and b/1.11/world/level.dat differ diff --git a/1.11/world/level.dat_old b/1.11/world/level.dat_old new file mode 100644 index 00000000..d6cfe850 Binary files /dev/null and b/1.11/world/level.dat_old differ diff --git a/1.11/world/region/r.-1.-1.mca b/1.11/world/region/r.-1.-1.mca new file mode 100644 index 00000000..16e6178c Binary files /dev/null and b/1.11/world/region/r.-1.-1.mca differ diff --git a/1.11/world/region/r.-1.0.mca b/1.11/world/region/r.-1.0.mca new file mode 100644 index 00000000..d7f5a572 Binary files /dev/null and b/1.11/world/region/r.-1.0.mca differ diff --git a/1.11/world/region/r.0.-1.mca b/1.11/world/region/r.0.-1.mca new file mode 100644 index 00000000..6a8e0a38 Binary files /dev/null and b/1.11/world/region/r.0.-1.mca differ diff --git a/1.11/world/region/r.0.0.mca b/1.11/world/region/r.0.0.mca new file mode 100644 index 00000000..71206912 Binary files /dev/null and b/1.11/world/region/r.0.0.mca differ diff --git a/1.11/world/session.lock b/1.11/world/session.lock new file mode 100644 index 00000000..d618d01c Binary files /dev/null and b/1.11/world/session.lock differ diff --git a/push.sh b/push.sh index cd25b2b6..e5aeff85 100644 --- a/push.sh +++ b/push.sh @@ -5,6 +5,7 @@ git status git add --all :/ IFS= read -r -p "Enter commit message: " com git commit -m "${com}" +echo $(git branch) IFS= read -r -p "Enter Branch name: " com1 git push nmd ${com1} git push github ${com1}