JCS-Prod/Orbital-Satellite
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3 from JackCarterSmith/CI-exp

Browse Source 
Ci exp
This commit is contained in:
JackCarterSmith 2018-11-06 15:27:51 +01:00 committed by GitHub
commit deb40f8da2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Jenkinsfile vendored Normal file
View File

@ -0,0 +1,37 @@
pipeline {
agent {
node {
label 'main'
}
}
stages {
stage('Setup') {
steps {
sh 'chmod +x gradlew'
sh './gradlew setupCIWorkspace'
}
}
stage('Check') {
steps {
sh './gradlew check'
}
}
stage('Compile') {
steps {
sh '''./gradlew clean
./gradlew build'''
}
}
stage('JAR release') {
steps {
sh './gradlew jar'
archiveArtifacts(artifacts: 'build/libs/OrbitalSatellite-*.jar', excludes: 'build/libs/OrbitalSatellite-*-sources.jar')
cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true)
}
}
}
environment {
JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64'
}
}

30
src/main/java/jackcartersmith/orbsat/common/CommonProxy.java
View File

@ -1,23 +1,7 @@
package jackcartersmith.orbsat.common; package jackcartersmith.orbsat.common;
import java.util.UUID;
import javax.annotation.Nonnull;
import com.mojang.authlib.GameProfile;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.network.IGuiHandler; import net.minecraftforge.fml.common.network.IGuiHandler;
public class CommonProxy implements IGuiHandler { public class CommonProxy implements IGuiHandler {
@ -53,6 +37,19 @@ public class CommonProxy implements IGuiHandler {
{ {
} }
@Override
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
// TODO Auto-generated method stub
return null;
}
@Override
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
// TODO Auto-generated method stub
return null;
}
/*
public static <T extends TileEntity & IGuiTile> void openGuiForTile(@Nonnull EntityPlayer player, @Nonnull T tile) public static <T extends TileEntity & IGuiTile> void openGuiForTile(@Nonnull EntityPlayer player, @Nonnull T tile)
{ {
player.openGui(OrbitalSatellite.instance, tile.getGuiID(), tile.getWorld(), tile.getPos().getX(), tile.getPos().getY(), tile.getPos().getZ()); player.openGui(OrbitalSatellite.instance, tile.getGuiID(), tile.getWorld(), tile.getPos().getX(), tile.getPos().getY(), tile.getPos().getZ());
@ -230,4 +227,5 @@ public class CommonProxy implements IGuiHandler {
public void clearRenderCaches() public void clearRenderCaches()
{ {
} }
*/
} }