Skip to content

Commit 073db47

Browse files
BlueStaggoBlueStaggo
committed
Basic stuff
1 parent 8fe55da commit 073db47

138 files changed

Lines changed: 8919 additions & 2 deletions

File tree

Some content is hidden

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

‎README.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
# MCDiverge
2-
Minecraft Diverge, a Minecraft Alpha 1.1.2_01 mod that takes the game towards a different direction.
1+
<p align="center">
2+
<img src="mcdiverge-logo.png">
3+
</p>
4+
5+
Minecraft Diverge is a Minecraft Alpha 1.1.2_01 mod that takes the game towards a different direction. It provides extra content for the late game and more creative power.
6+
7+
This is the Github repository for Minecraft Diverge, where users can submit issues and downlad new versions. The source code for Minecraft Diverge is partially available in the form of patch files from Retro-MCP version 1.0 pre3.

‎mcdiverge-logo.png‎

31.4 KB
Loading

‎patches_merged/credits.txt.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- /dev/null
2+
+++ b/credits.txt
3+
@@ -1,0 +1,8 @@
4+
+CREDITS
5+
+---
6+
+Minecraft: Mojang
7+
+Minecraft Diverge: BlueStag
8+
+Extra MCDiverge music: C418, Noski (Youtube)
9+
+Modding support: Modification Station
10+
+---
11+
+Github: https://github.com/BlueStaggo/MCDiverge

‎patches_merged/customres.txt.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--- /dev/null
2+
+++ b/customres.txt
3+
@@ -1,0 +1,10 @@
4+
+/resources/newmusic/diverge/cave1.ogg
5+
+/resources/newmusic/diverge/cave2.ogg
6+
+/resources/newmusic/diverge/cave3.ogg
7+
+/resources/newmusic/diverge/cave4.ogg
8+
+/resources/newmusic/diverge/title1.ogg
9+
+/resources/newmusic/diverge/title2.ogg
10+
+/resources/newmusic/diverge/title3.ogg
11+
+/resources/newmusic/diverge/title4.ogg
12+
+/resources/newsound/diverge/wand.ogg
13+
+/resources/streaming/diverge/magnet.ogg

‎patches_merged/gui/creative_items.txt.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--- /dev/null
2+
+++ b/gui/creative_items.txt
3+
@@ -1,0 +1,22 @@
4+
+002#0 003#0 001#0 001#1 001#2 004#0 004#1 004#2
5+
+016#0 015#0 014#0 056#0 073#0 021#0 021#1 021#2
6+
+000#0 000#0 000#0 000#0 000#0 044#0 044#1 044#2
7+
+000#0 042#0 041#0 057#0 000#0 044#3 044#4 044#5
8+
+012#0 013#0 080#0 079#0 078#0 044#6 044#7 044#8
9+
+006#0 017#0 005#0 053#0 023#0 067#0 000#0 000#0
10+
+045#0 044#9 000#0 082#0 338#0 081#0 037#0 038#0
11+
+331#0 076#0 050#0 049#0 324#0 330#0 039#0 040#0
12+
+020#0 019#0 018#0 047#0 048#0 046#0 077#0 070#0
13+
+058#0 061#0 054#0 084#0 085#0 323#0 069#0 072#0
14+
+000#0 000#0 000#0 000#0 000#0 000#0 000#0 000#0
15+
+268#0 269#0 270#0 271#0 298#0 299#0 300#0 301#0
16+
+272#0 273#0 274#0 275#0 302#0 303#0 304#0 305#0
17+
+267#0 256#0 257#0 258#0 306#0 307#0 308#0 309#0
18+
+283#0 284#0 285#0 286#0 314#0 315#0 316#0 317#0
19+
+276#0 277#0 278#0 279#0 310#0 311#0 312#0 313#0
20+
+290#0 291#0 292#0 294#0 293#0 295#0 296#0 297#0
21+
+280#0 288#0 289#0 287#0 260#0 322#0 319#0 320#0
22+
+344#0 332#0 281#0 282#0 325#0 326#0 327#0 335#0
23+
+329#0 333#0 334#0 318#0 336#0 337#0 261#0 262#0
24+
+328#0 342#0 343#0 066#0 339#0 340#0 341#0 259#0
25+
+263#0 265#0 266#0 264#0 345#0 346#0 321#0 000#0

‎patches_merged/gui/creative_items_wip.txt.patch‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--- /dev/null
2+
+++ b/gui/creative_items_wip.txt
3+
@@ -1,0 +1,5 @@
4+
+-- Stone
5+
+001#0 001#1 001#2 004#0 004#1 004#2 048#0 049#0
6+
+021#0 021#1 021#2 044#0 044#1 044#2 044#3 044#4
7+
+044#5 044#6 044#7 044#8 067#0 067#4 067#8 016#0
8+
+015#0 014#0 056#0 073#0

‎patches_merged/io/github/bluestaggo/mcdiverge/BlockBlaster.java.patch‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
--- /dev/null
2+
+++ b/io/github/bluestaggo/mcdiverge/BlockBlaster.java
3+
@@ -1,0 +1,51 @@
4+
+package io.github.bluestaggo.mcdiverge;
5+
+
6+
+import java.util.Random;
7+
+
8+
+import net.minecraft.src.*;
9+
+
10+
+public class BlockBlaster extends BlockFurnace {
11+
+ public BlockBlaster(int i1, boolean z2) {
12+
+ super(i1, z2, Material.iron);
13+
+ this.blockIndexInTexture = textureXY(14, 2);
14+
+ }
15+
+
16+
+ public int idDropped(int i1, Random random2) {
17+
+ return Block.blasterIdle.blockID;
18+
+ }
19+
+
20+
+ public int getBlockTexture(IBlockAccess iBlockAccess1, int i2, int i3, int i4, int i5) {
21+
+ if (i5 == 1) {
22+
+ return Block.blockSteel.blockIndexInTexture - 16;
23+
+ } else if (i5 == 0) {
24+
+ return Block.blockSteel.blockIndexInTexture + 16;
25+
+ } else {
26+
+ int i6 = iBlockAccess1.getBlockMetadata(i2, i3, i4);
27+
+ return i5 != i6 ? Block.blockSteel.blockIndexInTexture
28+
+ : (this.isActive ? this.blockIndexInTexture + 16 : this.blockIndexInTexture);
29+
+ }
30+
+ }
31+
+
32+
+ public int getBlockTextureFromSide(int i1) {
33+
+ return i1 == 1 ? Block.blockSteel.blockIndexInTexture - 16
34+
+ : (i1 == 0 ? Block.blockSteel.blockIndexInTexture + 16
35+
+ : (i1 == 3 ? this.blockIndexInTexture : Block.blockSteel.blockIndexInTexture));
36+
+ }
37+
+
38+
+ protected TileEntity getBlockEntity() {
39+
+ return new TileEntityFurnace(50, 2);
40+
+ }
41+
+
42+
+ public void updateFurnaceBlockState(boolean z0, World world1, int i2, int i3, int i4) {
43+
+ int i5 = world1.getBlockMetadata(i2, i3, i4);
44+
+ TileEntity tileEntity6 = world1.getBlockTileEntity(i2, i3, i4);
45+
+ if (z0) {
46+
+ world1.setBlockWithNotify(i2, i3, i4, Block.blasterActive.blockID);
47+
+ } else {
48+
+ world1.setBlockWithNotify(i2, i3, i4, Block.blasterIdle.blockID);
49+
+ }
50+
+
51+
+ world1.setBlockMetadataWithNotify(i2, i3, i4, i5);
52+
+ world1.setBlockTileEntity(i2, i3, i4, tileEntity6);
53+
+ }
54+
+}

‎patches_merged/io/github/bluestaggo/mcdiverge/BlockRefabricator.java.patch‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
--- /dev/null
2+
+++ b/io/github/bluestaggo/mcdiverge/BlockRefabricator.java
3+
@@ -1,0 +1,24 @@
4+
+package io.github.bluestaggo.mcdiverge;
5+
+
6+
+import net.minecraft.src.*;
7+
+
8+
+public class BlockRefabricator extends BlockContainer {
9+
+ public BlockRefabricator(int id) {
10+
+ super(id, Material.iron);
11+
+ this.blockIndexInTexture = textureXY(8, 1);
12+
+ }
13+
+
14+
+ public int getBlockTextureFromSide(int side) {
15+
+ return side == 1 ? textureXY(15, 6) : side == 0 ? textureXY(8, 3) : textureXY(14, 6);
16+
+ }
17+
+
18+
+ public boolean blockActivated(World worldObj, int x, int y, int z, EntityPlayer entityPlayer) {
19+
+ TileEntityRefabricator tileEntityRefabricator = (TileEntityRefabricator)worldObj.getBlockTileEntity(x, y, z);
20+
+ entityPlayer.displayGUIRefabricator(tileEntityRefabricator);
21+
+ return true;
22+
+ }
23+
+
24+
+ protected TileEntity getBlockEntity() {
25+
+ return new TileEntityRefabricator();
26+
+ }
27+
+}

‎patches_merged/io/github/bluestaggo/mcdiverge/BlockSpeleothem.java.patch‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
--- /dev/null
2+
+++ b/io/github/bluestaggo/mcdiverge/BlockSpeleothem.java
3+
@@ -1,0 +1,90 @@
4+
+package io.github.bluestaggo.mcdiverge;
5+
+
6+
+import net.minecraft.src.Block;
7+
+import net.minecraft.src.BlockOre;
8+
+import net.minecraft.src.Material;
9+
+import net.minecraft.src.World;
10+
+
11+
+public class BlockSpeleothem extends Block {
12+
+ public BlockSpeleothem(int i1, int i2) {
13+
+ super(i1, i2, Material.rock);
14+
+ }
15+
+
16+
+ public boolean canPlaceBlockAt(World world1, int i2, int i3, int i4) {
17+
+ return world1.isBlockNormalCube(i2, i3 - 1, i4)
18+
+ || (world1.isBlockNormalCube(i2, i3 - 2, i4) && world1.getBlockId(i2, i3 - 1, i4) == this.blockID)
19+
+ || world1.isBlockNormalCube(i2, i3 + 1, i4)
20+
+ || (world1.isBlockNormalCube(i2, i3 + 2, i4) && world1.getBlockId(i2, i3 + 1, i4) == this.blockID);
21+
+ }
22+
+
23+
+ public int getBlockTextureFromSideAndMetadata(int i1, int i2) {
24+
+ return this.blockIndexInTexture + (i2 & 3) * 16 + (i2 & 4) / 4;
25+
+ }
26+
+
27+
+ public void onNeighborBlockChange(World world1, int i2, int i3, int i4, int i5) {
28+
+ if (!canPlaceBlockAt(world1, i2, i3, i4)) {
29+
+ this.dropBlockAsItem(world1, i2, i3, i4, i5);
30+
+ world1.setBlockWithNotify(i2, i3, i4, 0);
31+
+ } else {
32+
+ updateMetadata(world1, i2, i3, i4);
33+
+ }
34+
+ }
35+
+
36+
+ public void onBlockAdded(World world1, int i2, int i3, int i4) {
37+
+ updateMetadata(world1, i2, i3, i4);
38+
+ }
39+
+
40+
+ private static boolean isSlate(World world1, int i2, int i3, int i4) {
41+
+ return (world1.getBlockId(i2, i3, i4) == Block.stone.blockID
42+
+ && world1.getBlockMetadata(i2, i3, i4) == 2)
43+
+ || (Block.blocksList[world1.getBlockId(i2, i3, i4)] instanceof BlockOre
44+
+ && world1.getBlockMetadata(i2, i3, i4) == 1);
45+
+ }
46+
+
47+
+ private void updateMetadata(World world1, int i2, int i3, int i4) {
48+
+ int metadata;
49+
+ if (world1.isBlockNormalCube(i2, i3 - 1, i4)) {
50+
+ if (world1.getBlockId(i2, i3 + 1, i4) == this.blockID) {
51+
+ metadata = 1;
52+
+ } else {
53+
+ metadata = 0;
54+
+ }
55+
+ if (isSlate(world1, i2, i3 - 1, i4)) {
56+
+ metadata += 4;
57+
+ }
58+
+ } else if (world1.isBlockNormalCube(i2, i3 + 1, i4)) {
59+
+ if (world1.getBlockId(i2, i3 - 1, i4) == this.blockID) {
60+
+ metadata = 2;
61+
+ } else {
62+
+ metadata = 3;
63+
+ }
64+
+ if (isSlate(world1, i2, i3 + 1, i4)) {
65+
+ metadata += 4;
66+
+ }
67+
+ } else if (world1.getBlockId(i2, i3 + 1, i4) == this.blockID) {
68+
+ metadata = 3;
69+
+ if (isSlate(world1, i2, i3 + 2, i4)) {
70+
+ metadata += 4;
71+
+ }
72+
+ } else {
73+
+ metadata = 0;
74+
+ if (isSlate(world1, i2, i3 - 2, i4)) {
75+
+ metadata += 4;
76+
+ }
77+
+ }
78+
+
79+
+ world1.setBlockMetadataWithNotify(i2, i3, i4, metadata);
80+
+ }
81+
+
82+
+ public boolean isOpaqueCube() {
83+
+ return false;
84+
+ }
85+
+
86+
+ public boolean renderAsNormalBlock() {
87+
+ return false;
88+
+ }
89+
+
90+
+ public int getRenderType() {
91+
+ return 1;
92+
+ }
93+
+}

‎patches_merged/io/github/bluestaggo/mcdiverge/CreateWorldInfo.java.patch‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
--- /dev/null
2+
+++ b/io/github/bluestaggo/mcdiverge/CreateWorldInfo.java
3+
@@ -1,0 +1,28 @@
4+
+package io.github.bluestaggo.mcdiverge;
5+
+
6+
+public class CreateWorldInfo {
7+
+ public String name;
8+
+ public long seed;
9+
+ public boolean snowy;
10+
+ public boolean creative;
11+
+
12+
+ public CreateWorldInfo withName(String name) {
13+
+ this.name = name;
14+
+ return this;
15+
+ }
16+
+
17+
+ public CreateWorldInfo withSeed(long seed) {
18+
+ this.seed = seed;
19+
+ return this;
20+
+ }
21+
+
22+
+ public CreateWorldInfo withSnow(boolean snowy) {
23+
+ this.snowy = snowy;
24+
+ return this;
25+
+ }
26+
+
27+
+ public CreateWorldInfo withCreative(boolean creative) {
28+
+ this.creative = creative;
29+
+ return this;
30+
+ }
31+
+}

0 commit comments

Comments
 (0)