Skip to content

Commit

Permalink
Merge pull request #32 from BTW-Community/dev
Browse files Browse the repository at this point in the history
2.13.4
  • Loading branch information
ammoore00 committed Apr 4, 2021
2 parents b7455ec + 65f8c4b commit 7d5911a
Show file tree
Hide file tree
Showing 57 changed files with 2,803 additions and 841 deletions.
20 changes: 6 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,16 @@ reobfuscate.sh
reobfuscate_srg.bat
reobfuscate_srg.sh
runtime/
reobf/

src deco/

src/minecraft/net/minecraft/src/FC*
src/minecraft_server/net/minecraft/src/FC*

src/minecraft/net/minecraft/src/World.java
src/minecraft_server/net/minecraft/src/World.java

src - BTW 4B02 clean/
src/minecraft/Start.java
src/minecraft/argo/
Expand Down Expand Up @@ -601,7 +607,6 @@ src/minecraft/net/minecraft/src/EntityPig.java
src/minecraft/net/minecraft/src/EntityPigZombie.java
src/minecraft/net/minecraft/src/EntityPlayer.java
src/minecraft/net/minecraft/src/EntityPlayerMP.java
src/minecraft/net/minecraft/src/EntityPlayerSP.java
src/minecraft/net/minecraft/src/EntityPortalFX.java
src/minecraft/net/minecraft/src/EntityPotion.java
src/minecraft/net/minecraft/src/EntityRainFX.java
Expand Down Expand Up @@ -943,12 +948,10 @@ src/minecraft/net/minecraft/src/FCBlockStake.java
src/minecraft/net/minecraft/src/FCBlockStakeString.java
src/minecraft/net/minecraft/src/FCBlockStem.java
src/minecraft/net/minecraft/src/FCBlockStep.java
src/minecraft/net/minecraft/src/FCBlockStone.java
src/minecraft/net/minecraft/src/FCBlockStoneBrick.java
src/minecraft/net/minecraft/src/FCBlockStoneBrickLoose.java
src/minecraft/net/minecraft/src/FCBlockStoneBrickLooseSlab.java
src/minecraft/net/minecraft/src/FCBlockStoneBrickLooseStairs.java
src/minecraft/net/minecraft/src/FCBlockStoneRough.java
src/minecraft/net/minecraft/src/FCBlockStub.java
src/minecraft/net/minecraft/src/FCBlockStumpCharred.java
src/minecraft/net/minecraft/src/FCBlockTallGrass.java
Expand Down Expand Up @@ -1095,7 +1098,6 @@ src/minecraft/net/minecraft/src/FCEntityCanvas.java
src/minecraft/net/minecraft/src/FCEntityCaveSpider.java
src/minecraft/net/minecraft/src/FCEntityChicken.java
src/minecraft/net/minecraft/src/FCEntityCow.java
src/minecraft/net/minecraft/src/FCEntityCreeper.java
src/minecraft/net/minecraft/src/FCEntityDynamite.java
src/minecraft/net/minecraft/src/FCEntityEnderman.java
src/minecraft/net/minecraft/src/FCEntityFallingBlock.java
Expand All @@ -1111,20 +1113,16 @@ src/minecraft/net/minecraft/src/FCEntityMechPowerHorizontal.java
src/minecraft/net/minecraft/src/FCEntityMiningCharge.java
src/minecraft/net/minecraft/src/FCEntityMovingAnchor.java
src/minecraft/net/minecraft/src/FCEntityMovingPlatform.java
src/minecraft/net/minecraft/src/FCEntityOcelot.java
src/minecraft/net/minecraft/src/FCEntityPig.java
src/minecraft/net/minecraft/src/FCEntityPigZombie.java
src/minecraft/net/minecraft/src/FCEntityRottenArrow.java
src/minecraft/net/minecraft/src/FCEntitySheep.java
src/minecraft/net/minecraft/src/FCEntitySkeleton.java
src/minecraft/net/minecraft/src/FCEntitySlime.java
src/minecraft/net/minecraft/src/FCEntitySnowman.java
src/minecraft/net/minecraft/src/FCEntitySoulSand.java
src/minecraft/net/minecraft/src/FCEntitySpider.java
src/minecraft/net/minecraft/src/FCEntitySpiderWeb.java
src/minecraft/net/minecraft/src/FCEntitySquid.java
src/minecraft/net/minecraft/src/FCEntityUrn.java
src/minecraft/net/minecraft/src/FCEntityVillager.java
src/minecraft/net/minecraft/src/FCEntityWaterWheel.java
src/minecraft/net/minecraft/src/FCEntityWindMill.java
src/minecraft/net/minecraft/src/FCEntityWindMillVertical.java
Expand Down Expand Up @@ -2178,7 +2176,6 @@ src/minecraft/net/minecraft/src/WeightedRandom.java
src/minecraft/net/minecraft/src/WeightedRandomChestContent.java
src/minecraft/net/minecraft/src/WeightedRandomItem.java
src/minecraft/net/minecraft/src/WeightedRandomMinecart.java
src/minecraft/net/minecraft/src/World.java
src/minecraft/net/minecraft/src/WorldChunkManager.java
src/minecraft/net/minecraft/src/WorldChunkManagerHell.java
src/minecraft/net/minecraft/src/WorldClient.java
Expand Down Expand Up @@ -3161,7 +3158,6 @@ src/minecraft_server/net/minecraft/src/FCEntityCanvas.java
src/minecraft_server/net/minecraft/src/FCEntityCaveSpider.java
src/minecraft_server/net/minecraft/src/FCEntityChicken.java
src/minecraft_server/net/minecraft/src/FCEntityCow.java
src/minecraft_server/net/minecraft/src/FCEntityCreeper.java
src/minecraft_server/net/minecraft/src/FCEntityDynamite.java
src/minecraft_server/net/minecraft/src/FCEntityEnderman.java
src/minecraft_server/net/minecraft/src/FCEntityFallingBlock.java
Expand All @@ -3177,18 +3173,15 @@ src/minecraft_server/net/minecraft/src/FCEntityMechPowerHorizontal.java
src/minecraft_server/net/minecraft/src/FCEntityMiningCharge.java
src/minecraft_server/net/minecraft/src/FCEntityMovingAnchor.java
src/minecraft_server/net/minecraft/src/FCEntityMovingPlatform.java
src/minecraft_server/net/minecraft/src/FCEntityOcelot.java
src/minecraft_server/net/minecraft/src/FCEntityPig.java
src/minecraft_server/net/minecraft/src/FCEntityPigZombie.java
src/minecraft_server/net/minecraft/src/FCEntityRottenArrow.java
src/minecraft_server/net/minecraft/src/FCEntitySheep.java
src/minecraft_server/net/minecraft/src/FCEntitySkeleton.java
src/minecraft_server/net/minecraft/src/FCEntitySlime.java
src/minecraft_server/net/minecraft/src/FCEntitySnowman.java
src/minecraft_server/net/minecraft/src/FCEntitySoulSand.java
src/minecraft_server/net/minecraft/src/FCEntitySpider.java
src/minecraft_server/net/minecraft/src/FCEntitySpiderWeb.java
src/minecraft_server/net/minecraft/src/FCEntitySquid.java
src/minecraft_server/net/minecraft/src/FCEntityUrn.java
src/minecraft_server/net/minecraft/src/FCEntityVillager.java
src/minecraft_server/net/minecraft/src/FCEntityWaterWheel.java
Expand Down Expand Up @@ -3926,7 +3919,6 @@ src/minecraft_server/net/minecraft/src/WeightedRandom.java
src/minecraft_server/net/minecraft/src/WeightedRandomChestContent.java
src/minecraft_server/net/minecraft/src/WeightedRandomItem.java
src/minecraft_server/net/minecraft/src/WeightedRandomMinecart.java
src/minecraft_server/net/minecraft/src/World.java
src/minecraft_server/net/minecraft/src/WorldChunkManager.java
src/minecraft_server/net/minecraft/src/WorldChunkManagerHell.java
src/minecraft_server/net/minecraft/src/WorldGenBigMushroom.java
Expand Down
9 changes: 8 additions & 1 deletion Deco_en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ tile.decoBlockStairsMossyCobble.name=Mossy Cobblestone Stairs
tile.decoBlockGraniteCobbleLoose.name=Loose Granite Cobblestone
tile.decoBlockAndesiteCobbleLoose.name=Loose Andesite Cobblestone
tile.decoBlockDioriteCobbleLoose.name=Loose Diorite Cobblestone
tile.decoBlockGrimstoneTilesLoose.name=Loose Slate Tiles
tile.decoBlockGraniteBrickLoose.name=Loose Granite Bricks
tile.decoBlockAndesiteBrickLoose.name=Loose Andesite Bricks
tile.decoBlockDioriteBrickLoose.name=Loose Diorite Bricks
tile.decoBlockGrimstoneBrickLoose.name=Loose Slate Bricks
tile.decoBlockGraniteStairs.name=Granite Stairs
tile.decoBlockAndesiteStairs.name=Andesite Stairs
tile.decoBlockDioriteStairs.name=Diorite Stairs
Expand Down Expand Up @@ -454,14 +456,17 @@ tile.decoBlockStone.diorite.name=Diorite
tile.decoBlockCobblestone.granite.name=Granite Cobblestone
tile.decoBlockCobblestone.andesite.name=Andesite Cobblestone
tile.decoBlockCobblestone.diorite.name=Diorite Cobblestone
tile.decoBlockCobblestone.grimstone.name=Slate Tiles

tile.decoBlockStoneBricks.granite.name=Granite Bricks
tile.decoBlockStoneBricks.andesite.name=Andesite Bricks
tile.decoBlockStoneBricks.diorite.name=Diorite Bricks
tile.decoBlockStoneBricks.grimstone.name=Slate Bricks

tile.decoBlockStoneSmooth.granite.name=Polished Granite
tile.decoBlockStoneSmooth.andesite.name=Polished Andesite
tile.decoBlockStoneSmooth.diorite.name=Polished Diorite
tile.decoBlockStoneSmooth.grimstone.name=Polished Grimstone

tile.decoBlockGraniteSiding.bench.name=Granite Bench
tile.decoBlockGraniteSiding.fence.name=Granite Wall
Expand Down Expand Up @@ -1069,7 +1074,7 @@ tile.decoBlockStoneSlab2.2.name=Diorite Slab
tile.decoBlockStoneSlab2.3.name=Polished Granite Slab
tile.decoBlockStoneSlab2.4.name=Polished Andesite Slab
tile.decoBlockStoneSlab2.5.name=Polished Diorite Slab
tile.decoBlockStoneSlab2.6.name=Granite Cobblestone Slab.name=
tile.decoBlockStoneSlab2.6.name=Granite Cobblestone Slab
tile.decoBlockStoneSlab2.7.name=Andesite Cobblestone Slab

tile.decoBlockStoneSlab3.0.name=Diorite Cobblestone Slab
Expand Down Expand Up @@ -1628,6 +1633,8 @@ item.decoItemDoorAcacia.name=Acacia Door
item.decoItemChiselDiamond.name=Diamondium Chisel
item.decoItemShearsDiamond.name=Diamondium Shears
item.decoItemNameTag.name=Name Tag
item.decoItemGrimstoneTile.name=Slate Tile
item.decoItemGrimstoneBrick.name=Slate Brick

# Deco Complex Items

Expand Down
18 changes: 11 additions & 7 deletions Modifed files.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ Render
RenderItemFrame
SlotRepair
TileEntitySignRenderer
ChunkCache
ServerConfigurationManager
FCBlockStairsWood
FCBlockGrass
FCBlockDirtSlab
Block
FCBlockStone
FCBlockStoneRough

ChunkCache*
PlayerControllerMP*
ServerConfigurationManager*
FCBlockStairsWood*
FCBlockGrass*
FCBlockDirtSlab*
Block*
##Clieny Only##
EntityPlayerSP
PlayerControllerMP
40 changes: 40 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,43 @@
Version 2.13.4
Some textures in this version have been used from Vanilla Tweaks. Their license allows inclusion of their work as long as there have either been modifications to their work, or their work is incorporated into a larger original work (aka anything that is not wholesale redistribution of the pack).
[list]
[*]Updated to Extended Addon API 1.1.0.
[*]Removed space in filename to assist users on linux.
[*]Added slate as a new stone variant. It is not yet obtainable in survival but is available in the creative menu.
[*]Changed the texture of stone variant bricks using textures from Vanilla Tweaks.
[*]Fixed an issue where trying to remove an item from an item frame in multiplayer would kick the client.
[*]Fixed an issue with the name of granite cobblestone slabs.
[*]Fixed an issue where diamond shears behaved inconsistently against creepers and sheep.
[*]Fixed an issue where squids inconsistently dropped prismarine.
[*]Fixed an issue where ocelots could still spawn on grass.
[/list]

Version 2.13.3
[list]
[*]Fixed an issue where shears were still not efficient against acacia and autumn leaves in the server version.
[*]Fixed an issue where making work stumps out of acacia or cherry did not damage the chisel enough.
[*]Fixed an issue where the typo for acacia bark from the last release was persisting.
[/list]

Version 2.13.2
[list]
[*]Changed versioning scheme
[*]Fixed an issue where flower pots overwrote spruce stairs in inventory. They will properly revert back to spruce stairs when installing this release.
[*]Fixed an issue where acacia logs dropped cherry bark when split in a crafting grid.
[*]Fixed an issue where a typo in the translation file caused acacia bark to display without a name.
[*]Fixed an issue where cherry moulding rendered in inventory with acacia texture.
[*]Fixed an issue where sawing acacia logs turned into cherry planks.
[*]Fixed an issue where shears were not efficient against acacia or autumn leaves.
[*]Fixed an issue where cherry and acacia logs could not be used as fuel in an oven.
[*]Fixed an issue where it took much less time to make a crafting table out of a cherry or acacia stump than other wood types.
[*]Fixed an issue with the capitalization of textures for pumpkins and prismarine causing some textures to not load correctly.
[/list]

Version 2.13b
[list]
[*]Fixed an issue where dirt slabs displayed the wrong top texture.
[/list]

Version 2.13
I lost most of the data on my PC between this version and the last. While the source code for deco was safe on github, I did lose the old changelog (new changelog is backed up on github now). I've tried to reconstruct it from memory but there is a high likelihood that some changes or fixes present in this version are not listed in the changelog.
THIS VERSION WILL REQUIRE A CLEAN INSTALL
Expand Down
119 changes: 119 additions & 0 deletions src/minecraft/net/minecraft/src/AddonBlockDirectional.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
package net.minecraft.src;

/**
* Extend this class to enable directional functionality like logs.
* Metadata 0-3 available for different types.
* 4-7 and 8-11 used for orientation of those types.
*/
public class AddonBlockDirectional extends Block {
public String[] topTextures;
public String[] sideTextures;

protected AddonBlockDirectional(int id, Material material, String[] topTextures, String[] sideTextures) {
super(id, material);
this.topTextures = topTextures;
this.sideTextures = sideTextures;
}

public boolean CanRotateOnTurntable(IBlockAccess access, int x, int y, int z) {
return (access.getBlockMetadata(x,y,z) & 12) != 0;
}

public int RotateMetadataAroundJAxis(int meta, boolean var2) {
int directionMeta = meta & 12;

if (directionMeta != 0) {
if (directionMeta == 4) {
directionMeta = 8;
}
else if (directionMeta == 8) {
directionMeta = 4;
}

meta = meta & -13 | directionMeta;
}

return meta;
}


public int onBlockPlaced(World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int meta) {
int type = meta & 3;
byte directionMeta = 0;

switch (side) {
case 0:
case 1:
directionMeta = 0;
break;
case 2:
case 3:
directionMeta = 8;
break;
case 4:
case 5:
directionMeta = 4;
}

return type | directionMeta;
}


public int damageDropped(int meta) {
return meta & 3;
}


public static int limitToValidMetadata(int meta) {
return meta & 3;
}

//CLIENT ONLY
public Icon[] topIcons;
public Icon[] sideIcons;

public Icon getIcon(int side, int meta) {
int directionMeta = meta & 12;
int type = meta & 3;

if (directionMeta == 0 && (side == 0 || side == 1) ||
directionMeta == 4 && (side == 4 || side == 5) ||
directionMeta == 8 && (side == 2 || side == 3)) {
return topIcons[type];
}
else {
return sideIcons[type];
}
}

public void registerIcons(IconRegister register) {
topIcons = new Icon[topTextures.length];
sideIcons = new Icon[topTextures.length];

for (int i = 0; i < topTextures.length; i++) {
topIcons[i] = register.registerIcon(topTextures[i]);
sideIcons[i] = register.registerIcon(sideTextures[i]);
}
}

public boolean RenderBlock(RenderBlocks render, int x, int y, int z) {
int meta = render.blockAccess.getBlockMetadata(x, y, z);
int directionMeta = meta & 12;

if (directionMeta == 4) {
render.SetUvRotateTop(1);
render.SetUvRotateBottom(1);
render.SetUvRotateWest(1);
render.SetUvRotateEast(1);
}
else if (directionMeta == 8) {
render.SetUvRotateNorth(1);
render.SetUvRotateSouth(1);
}

render.setRenderBounds(0D,0D,0D,1D,1D,1D);
render.renderStandardBlock(this, x, y, z);
render.ClearUvRotation();
return true;
}
}
Loading

0 comments on commit 7d5911a

Please sign in to comment.