Browse Source

change: Stabilize Minecraft Forge and mappings versions, bring OrbisAPI up to speed

alpha
JellySquid 11 months ago
parent
commit
079a7fbbfa

+ 1
- 0
.gitlab-ci.yml View File

@@ -4,6 +4,7 @@ before_script:

build:
script:
- export GRADLE_BUILD_SIGNED=true
- ./gradlew build
artifacts:
paths:

+ 1
- 1
OrbisAPI

@@ -1 +1 @@
Subproject commit 1167bcde5e13204304ca0ad21d797dcf3dad0ed4
Subproject commit 95496b351eac6ff668124bb9af4e2ad0bb41b1df

+ 4
- 6
build.gradle View File

@@ -8,16 +8,11 @@ buildscript {
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath 'org.ajoberstar:grgit:2.1.1'
}
}

import org.ajoberstar.grgit.*

apply plugin: 'net.minecraftforge.gradle.forge'

ext.repo = Grgit.open()

allprojects {
sourceCompatibility = 1.8
targetCompatibility = 1.8
@@ -91,4 +86,7 @@ task signJar(type: SignJar, dependsOn: reobfJar) {
outputFile = jar.archivePath
}

build.dependsOn signJar

if (System.getenv("GRADLE_BUILD_SIGNED") == 'true') {
build.dependsOn signJar
}

+ 2
- 2
gradle.properties View File

@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx2G
mod_version=1.12.2-1.1.0
forge_version=1.12.2-14.23.3.2678
forge_mappings=snapshot_20180503
forge_version=1.12.2-14.23.5.2768
forge_mappings=stable_39

+ 1
- 1
src/main/java/com/gildedgames/orbis/client/renderers/ChunkRendererManager.java View File

@@ -46,7 +46,7 @@ public class ChunkRendererManager implements PlayerOrbisObserver, IWorldObjectMa
throw new IllegalArgumentException("The world passed into getChunkRenderer is null");
}

return world.getChunkFromChunkCoords(chunkX, chunkZ).getCapability(OrbisCapabilities.CHUNK_RENDERER, EnumFacing.UP);
return world.getChunk(chunkX, chunkZ).getCapability(OrbisCapabilities.CHUNK_RENDERER, EnumFacing.UP);
}

public void unload()

+ 3
- 3
src/main/java/com/gildedgames/orbis/common/OrbisCore.java View File

@@ -77,7 +77,7 @@ public class OrbisCore

public static final String MOD_VERSION = "1.12.2-1.0.14";

public static final String MOD_DEPENDENCIES = "required-after:orbis_api@[1.12.2-1.1.12,)";
public static final String MOD_DEPENDENCIES = "required-after:orbis_api@[0.1.0,)";

public static final Logger LOGGER = LogManager.getLogger("Orbis");

@@ -191,11 +191,11 @@ public class OrbisCore
if (data != null)
{
dataCache = new DataCachePool(
new File(Minecraft.getMinecraft().mcDataDir, "/orbis/servers/" + data.serverIP.replace(":", "_") + "/cache/"));
new File(Minecraft.getMinecraft().gameDir, "/orbis/servers/" + data.serverIP.replace(":", "_") + "/cache/"));
}
else
{
dataCache = new DataCachePool(new File(Minecraft.getMinecraft().mcDataDir, "/orbis/local/cache/"));
dataCache = new DataCachePool(new File(Minecraft.getMinecraft().gameDir, "/orbis/local/cache/"));
}
}


+ 1
- 1
src/main/java/com/gildedgames/orbis/common/OrbisLocations.java View File

@@ -7,6 +7,6 @@ import java.io.File;
public class OrbisLocations
{

public static final File BLUEPRINTS = new File(Minecraft.getMinecraft().mcDataDir, "/orbis/blueprints/");
public static final File BLUEPRINTS = new File(Minecraft.getMinecraft().gameDir, "/orbis/blueprints/");

}

+ 2
- 2
src/main/java/com/gildedgames/orbis/common/blocks/BlocksOrbis.java View File

@@ -47,7 +47,7 @@ public class BlocksOrbis

private void register(final String registryName, final Block block)
{
block.setUnlocalizedName(OrbisCore.MOD_ID + "." + registryName);
block.setTranslationKey(OrbisCore.MOD_ID + "." + registryName);

block.setRegistryName(OrbisCore.MOD_ID, registryName);
this.registry.register(block);
@@ -56,7 +56,7 @@ public class BlocksOrbis

item = new ItemBlock(block);

item.setRegistryName(OrbisCore.MOD_ID, registryName).setUnlocalizedName(OrbisCore.MOD_ID + "." + registryName);
item.setRegistryName(OrbisCore.MOD_ID, registryName).setTranslationKey(OrbisCore.MOD_ID + "." + registryName);

ITEM_BLOCKS.add(item);
}

+ 1
- 1
src/main/java/com/gildedgames/orbis/common/items/ItemBlockPalette.java View File

@@ -88,7 +88,7 @@ public class ItemBlockPalette extends Item implements ModelRegisterCallback
ItemStack blockStack = new ItemStack(block.getBlockState().getBlock(), 1,
block.getBlockState().getBlock().getMetaFromState(block.getBlockState()));

String blockName = I18n.format(Item.getItemFromBlock(block.getBlockState().getBlock()).getUnlocalizedName(blockStack) + ".name");
String blockName = I18n.format(Item.getItemFromBlock(block.getBlockState().getBlock()).getTranslationKey(blockStack) + ".name");

tooltip.add(
MathHelper.floor(block.getReplaceCondition().getWeight()) + " " + blockName);

+ 2
- 2
src/main/java/com/gildedgames/orbis/common/items/ItemsOrbis.java View File

@@ -50,7 +50,7 @@ public class ItemsOrbis

private void register(final String registryName, final Item item)
{
item.setUnlocalizedName(OrbisCore.MOD_ID + "." + registryName);
item.setTranslationKey(OrbisCore.MOD_ID + "." + registryName);

item.setRegistryName(OrbisCore.MOD_ID, registryName);
this.registry.register(item);
@@ -65,7 +65,7 @@ public class ItemsOrbis
private void register(final ItemBlock item)
{
item.setRegistryName(Objects.requireNonNull(item.getBlock().getRegistryName()));
item.setUnlocalizedName(item.getBlock().getUnlocalizedName());
item.setTranslationKey(item.getBlock().getTranslationKey());
this.registry.register(item);
}
}

+ 1
- 1
src/main/java/com/gildedgames/orbis/common/util/OrbisRaytraceHelp.java View File

@@ -145,7 +145,7 @@ public class OrbisRaytraceHelp
Vec3d lookVec = player.getLookVec();

final Vec3d startPos = getPositionEyes(1.0F, player);
final Vec3d endPos = startPos.addVector(lookVec.x * reach, lookVec.y * reach, lookVec.z * reach);
final Vec3d endPos = startPos.add(lookVec.x * reach, lookVec.y * reach, lookVec.z * reach);

RayTraceResult blockRaytrace = raytraceLocateObject(player, startPos, endPos,
(world, pos, prevPos) ->

Loading…
Cancel
Save