forked from derfl007/df-roads
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rotatable signs / road blocks with multiple heights
- Loading branch information
1 parent
6c3ecd4
commit 494fcba
Showing
670 changed files
with
6,745 additions
and
31,917 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,119 @@ | ||
| buildscript { | ||
| repositories { | ||
| maven { url = 'https://files.minecraftforge.net/maven' } | ||
| jcenter() | ||
| maven { url = "http://files.minecraftforge.net/maven" } | ||
| mavenCentral() | ||
| } | ||
| dependencies { | ||
| classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' | ||
| classpath 'net.minecraftforge.gradle:ForgeGradle:3.+' | ||
| } | ||
| } | ||
| apply plugin: 'net.minecraftforge.gradle.forge' | ||
| //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. | ||
|
|
||
| apply plugin: 'net.minecraftforge.gradle' | ||
| // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. | ||
| apply plugin: 'eclipse' | ||
| apply plugin: 'maven-publish' | ||
|
|
||
|
|
||
| version = "1.5.2-mc1.12.2" //<modversion>-mc<minecraftversion> | ||
| version = "1.5.4-mc1.12.2" //<modversion>-mc<minecraftversion> | ||
| group = "derfl007.roads" // http://maven.apache.org/guides/mini/guide-naming-conventions.html | ||
| archivesBaseName = "df-roads" | ||
|
|
||
| sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. | ||
| compileJava { | ||
| sourceCompatibility = targetCompatibility = '1.8' | ||
| } | ||
|
|
||
| sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. | ||
|
|
||
| minecraft { | ||
| version = "1.12.2-14.23.5.2772" | ||
| runDir = "run" | ||
|
|
||
| // the mappings can be changed at any time, and must be in the following format. | ||
| // snapshot_YYYYMMDD snapshot are built nightly. | ||
| // stable_# stables are built at the discretion of the MCP team. | ||
| // The mappings can be changed at any time, and must be in the following format. | ||
| // snapshot_YYYYMMDD Snapshot are built nightly. | ||
| // stable_# Stables are built at the discretion of the MCP team. | ||
| // Use non-default mappings at your own risk. they may not always work. | ||
| // simply re-run your setup task after changing the mappings to update your workspace. | ||
| mappings = "snapshot_20171003" | ||
| // Simply re-run your setup task after changing the mappings to update your workspace. | ||
| //mappings channel: 'snapshot', version: '20171003-1.12' | ||
| mappings channel: 'snapshot', version: '20171003-1.12' | ||
| // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. | ||
|
|
||
| // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') | ||
|
|
||
| // Default run configurations. | ||
| // These can be tweaked, removed, or duplicated as needed. | ||
| runs { | ||
| client { | ||
| workingDirectory project.file('run') | ||
|
|
||
| // Recommended logging data for a userdev environment | ||
| property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' | ||
|
|
||
| // Recommended logging level for the console | ||
| property 'forge.logging.console.level', 'debug' | ||
| } | ||
|
|
||
| server { | ||
|
|
||
| // Recommended logging data for a userdev environment | ||
| property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' | ||
|
|
||
| // Recommended logging level for the console | ||
| property 'forge.logging.console.level', 'debug' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| // you may put jars on which you depend on in ./libs | ||
| // or you may define them like so.. | ||
| //compile "some.group:artifact:version:classifier" | ||
| //compile "some.group:artifact:version" | ||
|
|
||
| // real examples | ||
| //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env | ||
| //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env | ||
|
|
||
| // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. | ||
| //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, | ||
| // except that these dependencies get remapped to your current MCP mappings | ||
| //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
| //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // for more info... | ||
| // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed | ||
| // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. | ||
| // The userdev artifact is a special name and will get all sorts of transformations applied to it. | ||
| minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2855' | ||
|
|
||
| // You may put jars on which you depend on in ./libs or you may define them like so.. | ||
| // compile "some.group:artifact:version:classifier" | ||
| // compile "some.group:artifact:version" | ||
|
|
||
| // Real examples | ||
| // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env | ||
| // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env | ||
|
|
||
| // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. | ||
| // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // These dependencies get remapped to your current MCP mappings | ||
| // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // For more info... | ||
| // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html | ||
| // http://www.gradle.org/docs/current/userguide/dependency_management.html | ||
|
|
||
| } | ||
|
|
||
| processResources { | ||
| // this will ensure that this task is redone when the versions change. | ||
| inputs.property "version", project.version | ||
| inputs.property "mcversion", project.minecraft.version | ||
|
|
||
| // replace stuff in mcmod.info, nothing else | ||
| from(sourceSets.main.resources.srcDirs) { | ||
| include 'mcmod.info' | ||
|
|
||
| // replace version and mcversion | ||
| expand 'version':project.version, 'mcversion':project.minecraft.version | ||
| // Example for how to get properties into the manifest for reading by the runtime.. | ||
| jar { | ||
| manifest { | ||
| attributes([ | ||
| "Specification-Title": "examplemod", | ||
| "Specification-Vendor": "examplemodsareus", | ||
| "Specification-Version": "1", // We are version 1 of ourselves | ||
| "Implementation-Title": project.name, | ||
| "Implementation-Version": "${version}", | ||
| "Implementation-Vendor" :"examplemodsareus", | ||
| "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") | ||
| ]) | ||
| } | ||
|
|
||
| // copy everything else except the mcmod.info | ||
| from(sourceSets.main.resources.srcDirs) { | ||
| exclude 'mcmod.info' | ||
| } | ||
|
|
||
| // Example configuration to allow publishing using the maven-publish task | ||
| // This is the preferred method to reobfuscate your jar file | ||
| jar.finalizedBy('reobfJar') | ||
| // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing | ||
| //publish.dependsOn('reobfJar') | ||
|
|
||
| publishing { | ||
| publications { | ||
| mavenJava(MavenPublication) { | ||
| artifact jar | ||
| } | ||
| } | ||
| repositories { | ||
| maven { | ||
| url "file:///${project.projectDir}/mcmodsrepo" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,57 @@ | ||
| package derfl007.roads; | ||
|
|
||
| import java.util.Comparator; | ||
|
|
||
| import com.google.common.collect.Ordering; | ||
|
|
||
| import derfl007.roads.init.RoadBlocks; | ||
| import derfl007.roads.init.RoadItems; | ||
| import net.minecraft.block.Block; | ||
| import net.minecraft.creativetab.CreativeTabs; | ||
| import net.minecraft.item.Item; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.util.NonNullList; | ||
|
|
||
| public class RoadsTab extends CreativeTabs implements Comparator<ItemStack> { | ||
|
|
||
| public RoadsTab() { | ||
| super("tabRoads"); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public ItemStack getTabIconItem() { | ||
| return new ItemStack(RoadBlocks.road_line[2]); | ||
| } | ||
|
|
||
| @Override | ||
| public void displayAllRelevantItems(NonNullList<ItemStack> items) { | ||
| super.displayAllRelevantItems(items); | ||
| items.sort(this); | ||
| } | ||
|
|
||
| public class RoadsTab extends CreativeTabs { | ||
| @Override | ||
| public int compare(ItemStack o1, ItemStack o2) { | ||
| // TODO Auto-generated method stub | ||
| Block b1 = Block.getBlockFromItem(o1.getItem()); | ||
| Block b2 = Block.getBlockFromItem(o2.getItem()); | ||
|
|
||
| public RoadsTab() { | ||
| super("tabRoads"); | ||
| int i1 = RoadBlocks.RegistrationHandler.BLOCKS.indexOf(b1); | ||
| int i2 = RoadBlocks.RegistrationHandler.BLOCKS.indexOf(b2); | ||
|
|
||
| } | ||
| if (i1 >= 0 && i2 >= 0) { | ||
| return i1 - i2; | ||
| } | ||
| if (i1 >= 0) { | ||
| return -1; | ||
| } | ||
| if (i2 >= 0) { | ||
| return 1; | ||
| } | ||
|
|
||
| @Override | ||
| public ItemStack getTabIconItem() | ||
| { | ||
| return new ItemStack(RoadBlocks.road_line); | ||
| } | ||
| i1 = RoadItems.RegistrationHandler.ITEMS.indexOf(o1.getItem()); | ||
| i2 = RoadItems.RegistrationHandler.ITEMS.indexOf(o2.getItem()); | ||
|
|
||
| return i1 - i2; | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,28 @@ | ||
| package derfl007.roads; | ||
|
|
||
| import com.google.common.collect.Ordering; | ||
|
|
||
| import derfl007.roads.init.RoadBlocks; | ||
| import net.minecraft.block.Block; | ||
| import net.minecraft.creativetab.CreativeTabs; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.util.NonNullList; | ||
|
|
||
| public class SignsTab extends CreativeTabs { | ||
|
|
||
| public SignsTab() { | ||
| super("tabSigns"); | ||
| } | ||
| public SignsTab() { | ||
| super("tabSigns"); | ||
| } | ||
|
|
||
| @Override | ||
| public ItemStack getTabIconItem() { | ||
| return new ItemStack(RoadBlocks.road_sign_priority_2); | ||
| } | ||
| @Override | ||
| public ItemStack getTabIconItem() { | ||
| return new ItemStack(RoadBlocks.road_sign_priority_2); | ||
| } | ||
|
|
||
| } | ||
| @Override | ||
| public void displayAllRelevantItems(NonNullList<ItemStack> items) { | ||
| super.displayAllRelevantItems(items); | ||
| items.sort(Ordering.explicit(RoadBlocks.RegistrationHandler.BLOCKS) | ||
| .onResultOf((ItemStack item) -> Block.getBlockFromItem(item.getItem()))); | ||
| } | ||
| } |
Oops, something went wrong.