Skip to content

Commit

Permalink
updated to current pwlib[on maven]
Browse files Browse the repository at this point in the history
  • Loading branch information
p455w0rd committed Jul 20, 2019
1 parent a6d5624 commit c840038
Show file tree
Hide file tree
Showing 27 changed files with 372 additions and 290 deletions.
44 changes: 23 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
# eclipse
bin
libs
tmp
*.launch
.settings
.metadata
.classpath
.project
#Stolen form AE2 Repo. :D
# exclude all

# idea
out
*.ipr
*.iws
*.iml
.idea
/*

# gradle
build
.gradle
# Include important folders

# other
eclipse
run
# Gradle stuff
!gradle/
!gradlew
!gradlew.bat
!build.gradle
!gradle.properties
!settings.gradle

# Other Files.
!LICENSE
!README.md

# Include git important files
!.gitmodules
!.gitignore

# Include Important Folders
!src/
!libs/
147 changes: 26 additions & 121 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,131 +1,36 @@
buildscript {
repositories {
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
}
repositories {
jcenter()
mavenLocal()
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
}
dependencies {
classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT"
}
}

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

version = "1.12.2-" + getVersion()
group = "p455w0rd"
archivesBaseName = "EndermanEvolution"
sourceCompatibility = targetCompatibility = "1.8"

minecraft {
version = "1.12.2-14.23.5.2768"
runDir = "run"
mappings = "snapshot_20171003"
clientJvmArgs= ["-Dcofh.rf.crashOnOldAPI=false"]
}

repositories {
mavenCentral()
maven {
name = "progwml6"
url = "http://dvs1.progwml6.com/files/maven"
}
maven {
name = "tterrag"
url = "http://maven.tterrag.com"
}
maven {
name = "tterrag2"
url = "http://maven2.tterrag.com"
}
maven {
name = "tehnut"
url = "http://tehnut.info/maven"
}
maven {
name = "ChickenBones"
url "http://chickenbones.net/maven"
}
maven {
name = "CoFH"
url = "http://maven.covers1624.net"
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
}
maven {
name = "Curse"
url = "https://minecraft.curseforge.com/api/maven/"
}
}

dependencies {
deobfCompile "mezz.jei:jei_1.12.2:+"
deobfCompile "mcp.mobius.waila:Hwyla:1.8.26-B41_1.12.2"
deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12+"
deobfCompile "codechicken:CodeChickenLib:1.12.2-3.2.2.354:universal"
deobfCompile "codechicken:EnderStorage:1.12.2-2.4.5.135:universal"
deobfCompile "cpw.mods:ironchest:1.12.2-7.0.34.820"
deobfCompile "cofh:RedstoneFlux:1.12-2.1.0.6:universal"
deobfCompile "cofh:ThermalDynamics:1.12.2-2+:universal"
deobfCompile "cofh:ThermalFoundation:1.12.2-2+:universal"
deobfCompile "cofh:ThermalExpansion:1.12.2-5+:universal"
deobfCompile "cofh:CoFHCore:1.12.2-4+:universal"
deobfCompile "cofh:CoFHWorld:1.12.2-1+:universal"
deobfCompile "slimeknights:TConstruct:1.12.2-2.10.1.518"
deobfCompile "slimeknights.mantle:Mantle:1.12-1.3.2.38"
deobfCompile "immersive-engineering:ImmersiveEngineering:0.12:89"
deobfCompile "p455w0rd:p455w0rdslib:1.12.2-2.1.44"
deobfCompile "info.loenwind.autoconfig:AutoConfig:1.12.2-1.0.1"
deobfCompile "info.loenwind.autosave:AutoSave:1.12.2-1.0.8"
deobfCompile "com.enderio.core:EnderCore:1.12.2-0.5.44"
deobfCompile ("com.enderio:EnderIO:1.12.2-5.0.39") {
transitive = false
}
deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26"
deobfCompile "baubles:Baubles:1.12:1.5.2"
deobfCompile "placebo:Placebo:1.12.2:1.6.0"
deobfCompile "foundry:Foundry:1.10.2:2.2.3.0"
deobfCompile "primalcore:PrimalCore:1.12.2:0.6.104"
deobfCompile "journeymap:journeymap:1.12.2:5.5.5b4"

plugins {
id "com.wynprice.cursemaven" version "1.1.0"
}

processResources {
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/base.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/ccl.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/enderstorage.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/thermal.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/thaumcraft.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/ironchest.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/tconstruct.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/immersiveengineering.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/enderio.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/baubles.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/placebo.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/foundry.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/primalcore.gradle'
apply from : 'https://github.com/p455w0rd/buildscripts/raw/master/journeymap.gradle'

from (sourceSets.main.resources.srcDirs) {
include "mcmod.info"
expand "version": project.version, "mcversion": project.minecraft.version
}

from (sourceSets.main.resources.srcDirs) {
exclude "mcmod.info"
}
rename '(.+_at.cfg)', 'META-INF/$1'
}

jar {
manifest {
attributes 'FMLAT': 'endermanevo_at.cfg'
}
}

String getVersion() {
String major = "0";
String revision = "0";
String patch = "0";
String prefix = "public static final String VERSION = \"";
File file = file("src/main/java/p455w0rd/endermanevo/init/ModGlobals.java")
file.eachLine { String s ->
s = s.trim();
if (s.startsWith(prefix)) {
s = s.substring(prefix.length(), s.length() - 2);
String[] pts = s.split("\\.");

major = pts[0];
revision = pts[1];
patch = pts[2];
}
}
return "$major.$revision.$patch";
}
6 changes: 6 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
modPropertiesJavaFile=src/main/java/p455w0rd/endermanevo/init/ModGlobals.java
gitSlug=p455w0rd/EndermanEvolution
archiveBase=EndermanEvolution
buildAPIJar=1
artifactGroup=p455w0rd
jarGroup=p455w0rd.endermanevo
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = 'EndermanEvolution'
2 changes: 1 addition & 1 deletion src/main/java/p455w0rd/endermanevo/EndermanEvolution.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import p455w0rd.endermanevo.init.ModGlobals;
import p455w0rd.endermanevo.proxy.CommonProxy;

@Mod(modid = ModGlobals.MODID, name = ModGlobals.NAME, version = ModGlobals.VERSION, dependencies = ModGlobals.DEPENDANCIES, guiFactory = ModGlobals.GUI_FACTORY, acceptedMinecraftVersions = "1.12")
@Mod(modid = ModGlobals.MODID, name = ModGlobals.NAME, version = ModGlobals.VERSION, dependencies = ModGlobals.DEPENDANCIES, guiFactory = ModGlobals.GUI_FACTORY, acceptedMinecraftVersions = "[1.12.2]", certificateFingerprint = "@FINGERPRINT@")
public class EndermanEvolution {

@SidedProxy(clientSide = ModGlobals.CLIENT_PROXY, serverSide = ModGlobals.SERVER_PROXY)
Expand Down
38 changes: 19 additions & 19 deletions src/main/java/p455w0rd/endermanevo/blocks/BlockSkullBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ public class BlockSkullBase extends BlockSkull {
protected static final AxisAlignedBB EAST_AABB = new AxisAlignedBB(0.0D, 0.25D, 0.25D, 0.5D, 0.75D, 0.75D);
ItemBlock itemBlock = null;

private String NAME;
private final String NAME;

public BlockSkullBase(String name) {
public BlockSkullBase(final String name) {
NAME = name;
setUnlocalizedName(NAME);
setRegistryName(NAME);
Expand All @@ -55,7 +55,7 @@ public String getUnlocalizedName() {
}

@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
public AxisAlignedBB getBoundingBox(final IBlockState state, final IBlockAccess source, final BlockPos pos) {
switch (state.getValue(FACING)) {
case UP:
default:
Expand All @@ -72,22 +72,22 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, Bloc
}

@Override
public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) {
public void onBlockHarvested(final World worldIn, final BlockPos pos, final IBlockState state, final EntityPlayer player) {

}

@Override
public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) {
public IBlockState getStateForPlacement(final World worldIn, final BlockPos pos, final EnumFacing facing, final float hitX, final float hitY, final float hitZ, final int meta, final EntityLivingBase placer) {
return getDefaultState().withProperty(FACING, placer.getHorizontalFacing().getOpposite()).withProperty(NODROP, Boolean.valueOf(false));
}

@Override
public TileEntity createNewTileEntity(World world, int meta) {
public TileEntity createNewTileEntity(final World world, final int meta) {
return new TileBlockSkull(NAME);
}

@Override
public boolean canDispenserPlace(World world, BlockPos pos, ItemStack stack) {
public boolean canDispenserPlace(final World world, final BlockPos pos, final ItemStack stack) {
return false;
}

Expand All @@ -98,22 +98,22 @@ public Enderman() {
}

@Override
public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) {
public ItemStack getItem(final World worldIn, final BlockPos pos, final IBlockState state) {
return new ItemStack(ModItems.SKULL_ENDERMAN);
}

@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
public Item getItemDropped(final IBlockState state, final Random rand, final int fortune) {
return null;
}

@Override
public List<ItemStack> getDrops(IBlockAccess worldIn, BlockPos pos, IBlockState state, int fortune) {
public List<ItemStack> getDrops(final IBlockAccess worldIn, final BlockPos pos, final IBlockState state, final int fortune) {
return Lists.newArrayList(new ItemStack(ModItems.SKULL_ENDERMAN));
}

@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
public ItemStack getPickBlock(final IBlockState state, final RayTraceResult target, final World world, final BlockPos pos, final EntityPlayer player) {
return new ItemStack(ModItems.SKULL_ENDERMAN);
}

Expand All @@ -126,22 +126,22 @@ public Frienderman() {
}

@Override
public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) {
public ItemStack getItem(final World worldIn, final BlockPos pos, final IBlockState state) {
return new ItemStack(ModItems.SKULL_FRIENDERMAN);
}

@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
public Item getItemDropped(final IBlockState state, final Random rand, final int fortune) {
return ModItems.SKULL_FRIENDERMAN;
}

@Override
public List<ItemStack> getDrops(IBlockAccess worldIn, BlockPos pos, IBlockState state, int fortune) {
public List<ItemStack> getDrops(final IBlockAccess worldIn, final BlockPos pos, final IBlockState state, final int fortune) {
return Lists.newArrayList(new ItemStack(ModItems.SKULL_FRIENDERMAN));
}

@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
public ItemStack getPickBlock(final IBlockState state, final RayTraceResult target, final World world, final BlockPos pos, final EntityPlayer player) {
return new ItemStack(ModItems.SKULL_FRIENDERMAN);
}

Expand All @@ -154,22 +154,22 @@ public EvolvedEnderman() {
}

@Override
public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) {
public ItemStack getItem(final World worldIn, final BlockPos pos, final IBlockState state) {
return new ItemStack(ModItems.SKULL_EVOLVED_ENDERMAN);
}

@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
public Item getItemDropped(final IBlockState state, final Random rand, final int fortune) {
return ModItems.SKULL_EVOLVED_ENDERMAN;
}

@Override
public List<ItemStack> getDrops(IBlockAccess worldIn, BlockPos pos, IBlockState state, int fortune) {
public List<ItemStack> getDrops(final IBlockAccess worldIn, final BlockPos pos, final IBlockState state, final int fortune) {
return Lists.newArrayList(new ItemStack(ModItems.SKULL_EVOLVED_ENDERMAN));
}

@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
public ItemStack getPickBlock(final IBlockState state, final RayTraceResult target, final World world, final BlockPos pos, final EntityPlayer player) {
return new ItemStack(ModItems.SKULL_EVOLVED_ENDERMAN);
}

Expand Down
Loading

0 comments on commit c840038

Please sign in to comment.