Skip to content

Commit

Permalink
Merge master into feature/sponge-1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@stephan-gh
stephan-gh committed Jun 24, 2016
2 parents c00d123 + d0cf497 commit 6025a1e
Show file tree
Hide file tree
Showing 8 changed files with 220 additions and 54 deletions.
52 changes: 26 additions & 26 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
println """
*******************************************
You are building WorldEdit!
You are building WorldEdit!
If you encounter trouble:
1) Read COMPILING.md if you haven't yet
Expand All @@ -27,7 +27,7 @@ buildscript {

dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.1'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.4.0'
classpath 'org.ajoberstar:gradle-git:1.4.2'
}
}
Expand All @@ -50,15 +50,37 @@ if (!project.hasProperty("gitCommitHash")) {
ext.gitCommitHash = "no_git_id"
}

apply plugin: 'com.jfrog.artifactory'
artifactory {
contextUrl = "${artifactory_contextUrl}"
publish {
repository {
repoKey = project.version.contains("SNAPSHOT") ? 'libs-snapshot-local' : 'libs-release-local'
username = "${artifactory_user}"
password = "${artifactory_password}"
maven = true
}
}

resolve {
repository {
repoKey = 'repo'
username = "${artifactory_user}"
password = "${artifactory_password}"
maven = true
}
}
}

subprojects {
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'checkstyle'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.jfrog.artifactory-upload'
apply plugin: 'com.jfrog.artifactory'

group = 'com.sk89q.worldedit'
version = '6.1.3-SNAPSHOT'
version = '6.1.4-SNAPSHOT'
ext.internalVersion = version + ";" + gitCommitHash

sourceCompatibility = 1.7
Expand Down Expand Up @@ -117,26 +139,4 @@ subprojects {
exclude '.cache'
exclude 'LICENSE*'
}

artifactory {
contextUrl = "${artifactory_contextUrl}"
publish {
repository {
repoKey = project.version.contains("SNAPSHOT") ? 'libs-snapshot-local' : 'libs-release-local'
username = "${artifactory_user}"
password = "${artifactory_password}"
maven = true

}
}

resolve {
repository {
repoKey = 'repo'
username = "${artifactory_user}"
password = "${artifactory_password}"
maven = true
}
}
}
}
178 changes: 174 additions & 4 deletions worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/blocks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10202,7 +10202,7 @@
"legacyId": 159,
"id": "minecraft:stained_hardened_clay",
"unlocalizedName": "tile.clayHardenedStained",
"localizedName": "Stained Clay",
"localizedName": "Stained Hardened Clay",
"states": {
"color": {
"dataMask": 15,
Expand Down Expand Up @@ -10791,7 +10791,7 @@
"fragileWhenPushed": false,
"unpushable": true,
"adventureModeExempt": false,
"ambientOcclusionLightValue": 0.2,
"ambientOcclusionLightValue": 1.0,
"grassBlocking": false
}
},
Expand Down Expand Up @@ -14075,6 +14075,176 @@
"grassBlocking": false
}
},
{
"legacyId": 213,
"id": "minecraft:magma",
"unlocalizedName": "tile.magma",
"localizedName": "Magma Block",
"states": {},
"material": {
"powerSource": false,
"lightOpacity": 255,
"lightValue": 3,
"usingNeighborLight": false,
"hardness": 0.5,
"resistance": 2.5,
"ticksRandomly": true,
"fullCube": true,
"slipperiness": 0.6,
"renderedAsNormalBlock": true,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"adventureModeExempt": false,
"ambientOcclusionLightValue": 0.2,
"grassBlocking": false
}
},
{
"legacyId": 214,
"id": "minecraft:nether_wart_block",
"unlocalizedName": "tile.netherWartBlock",
"localizedName": "Nether Wart Block",
"states": {},
"material": {
"powerSource": false,
"lightOpacity": 255,
"lightValue": 0,
"usingNeighborLight": false,
"hardness": 1.0,
"resistance": 5.0,
"ticksRandomly": false,
"fullCube": true,
"slipperiness": 0.6,
"renderedAsNormalBlock": true,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": false,
"fragileWhenPushed": false,
"unpushable": false,
"adventureModeExempt": false,
"ambientOcclusionLightValue": 0.2,
"grassBlocking": false
}
},
{
"legacyId": 215,
"id": "minecraft:red_nether_brick",
"unlocalizedName": "tile.redNetherBrick",
"localizedName": "Red Nether Brick",
"states": {},
"material": {
"powerSource": false,
"lightOpacity": 255,
"lightValue": 0,
"usingNeighborLight": false,
"hardness": 2.0,
"resistance": 30.0,
"ticksRandomly": false,
"fullCube": true,
"slipperiness": 0.6,
"renderedAsNormalBlock": true,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"adventureModeExempt": false,
"ambientOcclusionLightValue": 0.2,
"grassBlocking": false
}
},
{
"legacyId": 216,
"id": "minecraft:bone_block",
"unlocalizedName": "tile.boneBlock",
"localizedName": "Bone Block",
"states": {
"axis": {
"dataMask": 8,
"values": {
"x": {
"data": 4
},
"y": {
"data": 0
},
"z": {
"data": 8
}
}
}
},
"material": {
"powerSource": false,
"lightOpacity": 255,
"lightValue": 0,
"usingNeighborLight": false,
"hardness": 2.0,
"resistance": 10.0,
"ticksRandomly": false,
"fullCube": true,
"slipperiness": 0.6,
"renderedAsNormalBlock": true,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"adventureModeExempt": false,
"ambientOcclusionLightValue": 0.2,
"grassBlocking": false
}
},
{
"legacyId": 217,
"id": "minecraft:structure_void",
"unlocalizedName": "tile.structureVoid",
"localizedName": "Structure Void",
"states": {},
"material": {
"powerSource": false,
"lightOpacity": 0,
"lightValue": 0,
"usingNeighborLight": true,
"hardness": 0.0,
"resistance": 0.0,
"ticksRandomly": false,
"fullCube": false,
"slipperiness": 0.6,
"renderedAsNormalBlock": false,
"liquid": false,
"solid": false,
"movementBlocker": false,
"burnable": false,
"opaque": false,
"replacedDuringPlacement": true,
"toolRequired": false,
"fragileWhenPushed": false,
"unpushable": false,
"adventureModeExempt": false,
"ambientOcclusionLightValue": 1.0,
"grassBlocking": false
}
},
{
"legacyId": 255,
"id": "minecraft:structure_block",
Expand Down Expand Up @@ -14102,7 +14272,7 @@
"material": {
"powerSource": false,
"lightOpacity": 255,
"lightValue": 15,
"lightValue": 0,
"usingNeighborLight": false,
"hardness": -1.0,
"resistance": 1.8E7,
Expand All @@ -14124,4 +14294,4 @@
"grassBlocking": false
}
}
]
]
8 changes: 4 additions & 4 deletions worldedit-forge/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}

dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
}
}

Expand All @@ -27,12 +27,12 @@ repositories {
}

//version = "6.1.2"
ext.forgeVersion = "12.16.1.1891"
ext.forgeVersion = "12.17.0.1965"
//ext.internalVersion = version + ";" + gitCommitHash

minecraft {
version = "1.9-${project.forgeVersion}"
mappings = "snapshot_20160505"
version = "1.9.4-${project.forgeVersion}"
mappings = "snapshot_20160617"
runDir = 'run'

replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java"
Expand Down
13 changes: 6 additions & 7 deletions worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeBiomeRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@
import com.sk89q.worldedit.world.biome.BiomeData;
import com.sk89q.worldedit.world.registry.BiomeRegistry;

import net.minecraft.world.biome.BiomeGenBase;

import java.util.ArrayList;
import java.util.List;
import net.minecraft.world.biome.Biome;

/**
* Provides access to biome data in Forge.
Expand All @@ -41,29 +40,29 @@ public BaseBiome createFromId(int id) {
@Override
public List<BaseBiome> getBiomes() {
List<BaseBiome> list = new ArrayList<BaseBiome>();
for (BiomeGenBase biome : BiomeGenBase.REGISTRY) {
list.add(new BaseBiome(BiomeGenBase.getIdForBiome(biome)));
for (Biome biome : Biome.REGISTRY) {
list.add(new BaseBiome(Biome.getIdForBiome(biome)));
}
return list;
}

@Override
public BiomeData getData(BaseBiome biome) {
return new ForgeBiomeData(BiomeGenBase.getBiome(biome.getId()));
return new ForgeBiomeData(Biome.getBiome(biome.getId()));
}

/**
* Cached biome data information.
*/
private static class ForgeBiomeData implements BiomeData {
private final BiomeGenBase biome;
private final Biome biome;

/**
* Create a new instance.
*
* @param biome the base biome
*/
private ForgeBiomeData(BiomeGenBase biome) {
private ForgeBiomeData(Biome biome) {
this.biome = biome;
}

Expand Down
4 changes: 2 additions & 2 deletions worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public void dispatchCUIEvent(CUIEvent event) {
}
PacketBuffer buffer = new PacketBuffer(Unpooled.copiedBuffer(send.getBytes(WECUIPacketHandler.UTF_8_CHARSET)));
SPacketCustomPayload packet = new SPacketCustomPayload(ForgeWorldEdit.CUI_PLUGIN_CHANNEL, buffer);
this.player.playerNetServerHandler.sendPacket(packet);
this.player.connection.sendPacket(packet);
}

@Override
Expand Down Expand Up @@ -154,7 +154,7 @@ private void sendColorized(String msg, TextFormatting formatting) {

@Override
public void setPosition(Vector pos, float pitch, float yaw) {
this.player.playerNetServerHandler.setPlayerLocation(pos.getX(), pos.getY(), pos.getZ(), yaw, pitch);
this.player.connection.setPlayerLocation(pos.getX(), pos.getY(), pos.getZ(), yaw, pitch);
}

@Override
Expand Down
Loading

0 comments on commit 6025a1e

Please sign in to comment.