Skip to content

Commit

Permalink
Basic stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@BlueStaggo
BlueStaggo committed Dec 27, 2022
1 parent 8fe55da commit 073db47
Show file tree
Hide file tree
Showing 138 changed files with 8,919 additions and 2 deletions.
9 changes: 7 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
# MCDiverge
Minecraft Diverge, a Minecraft Alpha 1.1.2_01 mod that takes the game towards a different direction.
<p align="center">
<img src="mcdiverge-logo.png">
</p>

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.

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.
Binary file added mcdiverge-logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions patches_merged/credits.txt.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- /dev/null
+++ b/credits.txt
@@ -1,0 +1,8 @@
+CREDITS
+---
+Minecraft: Mojang
+Minecraft Diverge: BlueStag
+Extra MCDiverge music: C418, Noski (Youtube)
+Modding support: Modification Station
+---
+Github: https://github.com/BlueStaggo/MCDiverge
13 changes: 13 additions & 0 deletions patches_merged/customres.txt.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- /dev/null
+++ b/customres.txt
@@ -1,0 +1,10 @@
+/resources/newmusic/diverge/cave1.ogg
+/resources/newmusic/diverge/cave2.ogg
+/resources/newmusic/diverge/cave3.ogg
+/resources/newmusic/diverge/cave4.ogg
+/resources/newmusic/diverge/title1.ogg
+/resources/newmusic/diverge/title2.ogg
+/resources/newmusic/diverge/title3.ogg
+/resources/newmusic/diverge/title4.ogg
+/resources/newsound/diverge/wand.ogg
+/resources/streaming/diverge/magnet.ogg
25 changes: 25 additions & 0 deletions patches_merged/gui/creative_items.txt.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--- /dev/null
+++ b/gui/creative_items.txt
@@ -1,0 +1,22 @@
+002#0 003#0 001#0 001#1 001#2 004#0 004#1 004#2
+016#0 015#0 014#0 056#0 073#0 021#0 021#1 021#2
+000#0 000#0 000#0 000#0 000#0 044#0 044#1 044#2
+000#0 042#0 041#0 057#0 000#0 044#3 044#4 044#5
+012#0 013#0 080#0 079#0 078#0 044#6 044#7 044#8
+006#0 017#0 005#0 053#0 023#0 067#0 000#0 000#0
+045#0 044#9 000#0 082#0 338#0 081#0 037#0 038#0
+331#0 076#0 050#0 049#0 324#0 330#0 039#0 040#0
+020#0 019#0 018#0 047#0 048#0 046#0 077#0 070#0
+058#0 061#0 054#0 084#0 085#0 323#0 069#0 072#0
+000#0 000#0 000#0 000#0 000#0 000#0 000#0 000#0
+268#0 269#0 270#0 271#0 298#0 299#0 300#0 301#0
+272#0 273#0 274#0 275#0 302#0 303#0 304#0 305#0
+267#0 256#0 257#0 258#0 306#0 307#0 308#0 309#0
+283#0 284#0 285#0 286#0 314#0 315#0 316#0 317#0
+276#0 277#0 278#0 279#0 310#0 311#0 312#0 313#0
+290#0 291#0 292#0 294#0 293#0 295#0 296#0 297#0
+280#0 288#0 289#0 287#0 260#0 322#0 319#0 320#0
+344#0 332#0 281#0 282#0 325#0 326#0 327#0 335#0
+329#0 333#0 334#0 318#0 336#0 337#0 261#0 262#0
+328#0 342#0 343#0 066#0 339#0 340#0 341#0 259#0
+263#0 265#0 266#0 264#0 345#0 346#0 321#0 000#0
8 changes: 8 additions & 0 deletions patches_merged/gui/creative_items_wip.txt.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- /dev/null
+++ b/gui/creative_items_wip.txt
@@ -1,0 +1,5 @@
+-- Stone
+001#0 001#1 001#2 004#0 004#1 004#2 048#0 049#0
+021#0 021#1 021#2 044#0 044#1 044#2 044#3 044#4
+044#5 044#6 044#7 044#8 067#0 067#4 067#8 016#0
+015#0 014#0 056#0 073#0
54 changes: 54 additions & 0 deletions patches_merged/io/github/bluestaggo/mcdiverge/BlockBlaster.java.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
--- /dev/null
+++ b/io/github/bluestaggo/mcdiverge/BlockBlaster.java
@@ -1,0 +1,51 @@
+package io.github.bluestaggo.mcdiverge;
+
+import java.util.Random;
+
+import net.minecraft.src.*;
+
+public class BlockBlaster extends BlockFurnace {
+ public BlockBlaster(int i1, boolean z2) {
+ super(i1, z2, Material.iron);
+ this.blockIndexInTexture = textureXY(14, 2);
+ }
+
+ public int idDropped(int i1, Random random2) {
+ return Block.blasterIdle.blockID;
+ }
+
+ public int getBlockTexture(IBlockAccess iBlockAccess1, int i2, int i3, int i4, int i5) {
+ if (i5 == 1) {
+ return Block.blockSteel.blockIndexInTexture - 16;
+ } else if (i5 == 0) {
+ return Block.blockSteel.blockIndexInTexture + 16;
+ } else {
+ int i6 = iBlockAccess1.getBlockMetadata(i2, i3, i4);
+ return i5 != i6 ? Block.blockSteel.blockIndexInTexture
+ : (this.isActive ? this.blockIndexInTexture + 16 : this.blockIndexInTexture);
+ }
+ }
+
+ public int getBlockTextureFromSide(int i1) {
+ return i1 == 1 ? Block.blockSteel.blockIndexInTexture - 16
+ : (i1 == 0 ? Block.blockSteel.blockIndexInTexture + 16
+ : (i1 == 3 ? this.blockIndexInTexture : Block.blockSteel.blockIndexInTexture));
+ }
+
+ protected TileEntity getBlockEntity() {
+ return new TileEntityFurnace(50, 2);
+ }
+
+ public void updateFurnaceBlockState(boolean z0, World world1, int i2, int i3, int i4) {
+ int i5 = world1.getBlockMetadata(i2, i3, i4);
+ TileEntity tileEntity6 = world1.getBlockTileEntity(i2, i3, i4);
+ if (z0) {
+ world1.setBlockWithNotify(i2, i3, i4, Block.blasterActive.blockID);
+ } else {
+ world1.setBlockWithNotify(i2, i3, i4, Block.blasterIdle.blockID);
+ }
+
+ world1.setBlockMetadataWithNotify(i2, i3, i4, i5);
+ world1.setBlockTileEntity(i2, i3, i4, tileEntity6);
+ }
+}
27 changes: 27 additions & 0 deletions patches_merged/io/github/bluestaggo/mcdiverge/BlockRefabricator.java.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--- /dev/null
+++ b/io/github/bluestaggo/mcdiverge/BlockRefabricator.java
@@ -1,0 +1,24 @@
+package io.github.bluestaggo.mcdiverge;
+
+import net.minecraft.src.*;
+
+public class BlockRefabricator extends BlockContainer {
+ public BlockRefabricator(int id) {
+ super(id, Material.iron);
+ this.blockIndexInTexture = textureXY(8, 1);
+ }
+
+ public int getBlockTextureFromSide(int side) {
+ return side == 1 ? textureXY(15, 6) : side == 0 ? textureXY(8, 3) : textureXY(14, 6);
+ }
+
+ public boolean blockActivated(World worldObj, int x, int y, int z, EntityPlayer entityPlayer) {
+ TileEntityRefabricator tileEntityRefabricator = (TileEntityRefabricator)worldObj.getBlockTileEntity(x, y, z);
+ entityPlayer.displayGUIRefabricator(tileEntityRefabricator);
+ return true;
+ }
+
+ protected TileEntity getBlockEntity() {
+ return new TileEntityRefabricator();
+ }
+}
93 changes: 93 additions & 0 deletions patches_merged/io/github/bluestaggo/mcdiverge/BlockSpeleothem.java.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
--- /dev/null
+++ b/io/github/bluestaggo/mcdiverge/BlockSpeleothem.java
@@ -1,0 +1,90 @@
+package io.github.bluestaggo.mcdiverge;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.BlockOre;
+import net.minecraft.src.Material;
+import net.minecraft.src.World;
+
+public class BlockSpeleothem extends Block {
+ public BlockSpeleothem(int i1, int i2) {
+ super(i1, i2, Material.rock);
+ }
+
+ public boolean canPlaceBlockAt(World world1, int i2, int i3, int i4) {
+ return world1.isBlockNormalCube(i2, i3 - 1, i4)
+ || (world1.isBlockNormalCube(i2, i3 - 2, i4) && world1.getBlockId(i2, i3 - 1, i4) == this.blockID)
+ || world1.isBlockNormalCube(i2, i3 + 1, i4)
+ || (world1.isBlockNormalCube(i2, i3 + 2, i4) && world1.getBlockId(i2, i3 + 1, i4) == this.blockID);
+ }
+
+ public int getBlockTextureFromSideAndMetadata(int i1, int i2) {
+ return this.blockIndexInTexture + (i2 & 3) * 16 + (i2 & 4) / 4;
+ }
+
+ public void onNeighborBlockChange(World world1, int i2, int i3, int i4, int i5) {
+ if (!canPlaceBlockAt(world1, i2, i3, i4)) {
+ this.dropBlockAsItem(world1, i2, i3, i4, i5);
+ world1.setBlockWithNotify(i2, i3, i4, 0);
+ } else {
+ updateMetadata(world1, i2, i3, i4);
+ }
+ }
+
+ public void onBlockAdded(World world1, int i2, int i3, int i4) {
+ updateMetadata(world1, i2, i3, i4);
+ }
+
+ private static boolean isSlate(World world1, int i2, int i3, int i4) {
+ return (world1.getBlockId(i2, i3, i4) == Block.stone.blockID
+ && world1.getBlockMetadata(i2, i3, i4) == 2)
+ || (Block.blocksList[world1.getBlockId(i2, i3, i4)] instanceof BlockOre
+ && world1.getBlockMetadata(i2, i3, i4) == 1);
+ }
+
+ private void updateMetadata(World world1, int i2, int i3, int i4) {
+ int metadata;
+ if (world1.isBlockNormalCube(i2, i3 - 1, i4)) {
+ if (world1.getBlockId(i2, i3 + 1, i4) == this.blockID) {
+ metadata = 1;
+ } else {
+ metadata = 0;
+ }
+ if (isSlate(world1, i2, i3 - 1, i4)) {
+ metadata += 4;
+ }
+ } else if (world1.isBlockNormalCube(i2, i3 + 1, i4)) {
+ if (world1.getBlockId(i2, i3 - 1, i4) == this.blockID) {
+ metadata = 2;
+ } else {
+ metadata = 3;
+ }
+ if (isSlate(world1, i2, i3 + 1, i4)) {
+ metadata += 4;
+ }
+ } else if (world1.getBlockId(i2, i3 + 1, i4) == this.blockID) {
+ metadata = 3;
+ if (isSlate(world1, i2, i3 + 2, i4)) {
+ metadata += 4;
+ }
+ } else {
+ metadata = 0;
+ if (isSlate(world1, i2, i3 - 2, i4)) {
+ metadata += 4;
+ }
+ }
+
+ world1.setBlockMetadataWithNotify(i2, i3, i4, metadata);
+ }
+
+ public boolean isOpaqueCube() {
+ return false;
+ }
+
+ public boolean renderAsNormalBlock() {
+ return false;
+ }
+
+ public int getRenderType() {
+ return 1;
+ }
+}
31 changes: 31 additions & 0 deletions patches_merged/io/github/bluestaggo/mcdiverge/CreateWorldInfo.java.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
--- /dev/null
+++ b/io/github/bluestaggo/mcdiverge/CreateWorldInfo.java
@@ -1,0 +1,28 @@
+package io.github.bluestaggo.mcdiverge;
+
+public class CreateWorldInfo {
+ public String name;
+ public long seed;
+ public boolean snowy;
+ public boolean creative;
+
+ public CreateWorldInfo withName(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public CreateWorldInfo withSeed(long seed) {
+ this.seed = seed;
+ return this;
+ }
+
+ public CreateWorldInfo withSnow(boolean snowy) {
+ this.snowy = snowy;
+ return this;
+ }
+
+ public CreateWorldInfo withCreative(boolean creative) {
+ this.creative = creative;
+ return this;
+ }
+}
29 changes: 29 additions & 0 deletions patches_merged/io/github/bluestaggo/mcdiverge/FurnaceRecipe.java.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--- /dev/null
+++ b/io/github/bluestaggo/mcdiverge/FurnaceRecipe.java
@@ -1,0 +1,26 @@
+package io.github.bluestaggo.mcdiverge;
+
+import net.minecraft.src.ItemStack;
+
+public class FurnaceRecipe {
+ private final ItemStack input, output;
+
+ public FurnaceRecipe(ItemStack input, ItemStack output) {
+ this.input = input;
+ this.output = output;
+ }
+
+ public ItemStack getInput() {
+ return input;
+ }
+
+ public ItemStack getOutput(ItemStack input) {
+ return output.itemMetadata == -1 ? output.copy().withMetadata(input.itemMetadata) : output;
+ }
+
+ public boolean canSmelt(ItemStack input) {
+ return this.input.itemID == input.itemID
+ && (this.input.itemMetadata < 0
+ || this.input.itemMetadata == input.itemMetadata);
+ }
+}
70 changes: 70 additions & 0 deletions patches_merged/io/github/bluestaggo/mcdiverge/FurnaceRecipeManager.java.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
--- /dev/null
+++ b/io/github/bluestaggo/mcdiverge/FurnaceRecipeManager.java
@@ -1,0 +1,67 @@
+package io.github.bluestaggo.mcdiverge;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FurnaceRecipeManager {
+ private static final FurnaceRecipeManager instance = new FurnaceRecipeManager();
+ private List<FurnaceRecipe> recipes = new ArrayList<>();
+
+ public static final FurnaceRecipeManager getInstance() {
+ return instance;
+ }
+
+ private FurnaceRecipeManager() {
+ addRecipe(Block.oreCoal.blockID, Item.coal.shiftedIndex, -1, 0);
+ addRecipe(Block.oreIron.blockID, Item.ingotIron.shiftedIndex, -1, 0);
+ addRecipe(Block.oreGold.blockID, Item.ingotGold.shiftedIndex, -1, 0);
+ addRecipe(Block.oreDiamond.blockID, Item.diamond.shiftedIndex, -1, 0);
+ addRecipe(Block.oreRuby.blockID, Item.ruby.shiftedIndex, -1, 0);
+ addRecipe(Block.oreSapphire.blockID, Item.sapphire.shiftedIndex, -1, 0);
+ addRecipe(Block.sand.blockID, Block.glass.blockID, 0, 0);
+ addRecipe(Item.porkRaw.shiftedIndex, Item.porkCooked.shiftedIndex, 0, 0);
+ addRecipe(Item.beefRaw.shiftedIndex, Item.beefCooked.shiftedIndex, 0, 0);
+ addRecipe(Item.chickenRaw.shiftedIndex, Item.chickenCooked.shiftedIndex, 0, 0);
+ addRecipe(Item.muttonRaw.shiftedIndex, Item.muttonCooked.shiftedIndex, 0, 0);
+ addRecipe(Block.cobblestone.blockID, Block.stone.blockID, -1, -1);
+ addRecipe(Item.clay.shiftedIndex, Item.brick.shiftedIndex, 0, 0);
+ addRecipe(Item.starChunk.shiftedIndex, Item.starDust.shiftedIndex, 0, 0);
+ }
+
+ private void addRecipe(int input, int output, int inputMeta, int outputMeta) {
+ recipes.add(new FurnaceRecipe(new ItemStack(input, 1).withMetadata(inputMeta),
+ new ItemStack(output, 1).withMetadata(outputMeta)));
+ }
+
+ public ItemStack findMatchingRecipe(ItemStack input) {
+ for (FurnaceRecipe recipe : recipes) {
+ if (recipe.canSmelt(input)) {
+ return recipe.getOutput(input);
+ }
+ }
+ return null;
+ }
+
+ public int count() {
+ return this.recipes.size();
+ }
+
+ public ItemStack[] getRecipeAsItems(int i) {
+ ItemStack in = this.recipes.get(i).getInput();
+ ItemStack out = this.recipes.get(i).getOutput(in);
+ if (in.itemMetadata == -1) {
+ in.itemMetadata = 0;
+ }
+ if (out.itemMetadata == -1) {
+ out.itemMetadata = 0;
+ }
+
+ return new ItemStack[] { in, new ItemStack(Block.stoneOvenIdle),
+ null, null, null, null, null, null, null,
+ out };
+ }
+}
Loading

0 comments on commit 073db47

Please sign in to comment.