Skip to content

Commit 6f8395c

Browse files
committed
Updated to Minecraft 1.8.9
Camouflages works correctly, almost as before Can't get the texture for a specific side of a block when transforming Reimplemented Waila support Fixed bug from 1.7.10 with extensions of GuiManager and entering negative numbers Changed to a not Deprecated method of using Fluids Renamed liquid to fluid fo consistency
1 parent 23e8bb2 commit 6f8395c

File tree

223 files changed

+3485
-1613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+3485
-1613
lines changed

.gitignore

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1-
eclipse/
2-
build/
3-
*.iml
4-
*.iws
1+
# eclipse
2+
bin
3+
*.launch
4+
.settings
5+
.metadata
6+
.classpath
7+
.project
8+
9+
# idea
10+
out
511
*.ipr
6-
.gradle/
7-
libs/
8-
out/
12+
*.iws
13+
*.iml
14+
.idea
15+
16+
# gradle
17+
build
18+
19+
# other
20+
eclipse
21+
run
22+
libs
23+
classes

README.md

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,14 @@ Setup Workspace
1010
git clone [git-repo-url]
1111
```
1212

13-
Download [CodeChickenCore-1.7.2-1.0.0-dev][1], [NotEnoughItems-1.7.2-1.0.1-dev][1] & [Waila-1.5.2a_1.7.2][2]
13+
If you don't have [Gradle][1] installed on your computer you can use `gradlew` or `gradlew.bat` instead
1414

15-
Add a folder called `libs`, in the folder put the three downloaded `.jar` files.
15+
For help setting up a ForgeGradle workspace, go to this [forum page][2].
1616

17-
If you don't have [Gradle][3] installed on your computer you can use `gradlew` or `gradlew.bat` instead
17+
How to install it is a bit different depending on what IDE you are using.
1818

19-
For help setting up a ForgeGradle workspace, go to this [forum page][4].
19+
Instructions on how to install is in [README.txt][3]
2020

21-
##### Installing for Intellij IDEA
22-
```sh
23-
gradle setupDecompWorkspace idea
24-
```
25-
26-
##### Installing for Eclipse
27-
```sh
28-
gradle setupDecompWorkspace eclipse
29-
```
30-
31-
[1]:http://www.chickenbones.craftsaddle.org/Files/New_Versions/links.php
32-
[2]:http://www.minecraftforum.net/topic/1846244-172-
33-
[3]:http://www.gradle.org/
34-
[4]:http://www.minecraftforge.net/forum/index.php/topic,14048.0.html
21+
[1]:http://www.gradle.org/
22+
[2]:http://www.minecraftforge.net/forum/index.php/topic,14048.0.html
23+
[3]:README.txt

README.txt

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
-------------------------------------------
2+
Source installation information for modders
3+
-------------------------------------------
4+
This code follows the Minecraft Forge installation methodology. It will apply
5+
some small patches to the vanilla MCP source code, giving you and it access
6+
to some of the data and functions you need to build a successful mod.
7+
8+
Note also that the patches are built against "unrenamed" MCP source code (aka
9+
srgnames) - this means that you will not be able to read them directly against
10+
normal code.
11+
12+
Source pack installation information:
13+
14+
Standalone source installation
15+
==============================
16+
17+
Step 1: Open your command-line and browse to the folder where you extracted the zip file.
18+
19+
Step 2: Once you have a command window up in the folder that the downloaded material was placed, type:
20+
21+
Windows: "gradlew setupDecompWorkspace"
22+
Linux/Mac OS: "./gradlew setupDecompWorkspace"
23+
24+
Step 3: After all that finished, you're left with a choice.
25+
For eclipse, run "gradlew eclipse" (./gradlew eclipse if you are on Mac/Linux)
26+
27+
If you preffer to use IntelliJ, steps are a little different.
28+
1. Open IDEA, and import project.
29+
2. Select your build.gradle file and have it import.
30+
3. Once it's finished you must close IntelliJ and run the following command:
31+
32+
"gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux)
33+
34+
Step 4: The final step is to open Eclipse and switch your workspace to /eclipse/ (if you use IDEA, it should automatically start on your project)
35+
36+
If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not effect your code} and then start the processs again.
37+
38+
Should it still not work,
39+
Refer to #ForgeGradle on EsperNet for more information about the gradle environment.
40+
41+
Tip:
42+
If you do not care about seeing Minecraft's source code you can replace "setupDecompWorkspace" with one of the following:
43+
"setupDevWorkspace": Will patch, deobfusicated, and gather required assets to run minecraft, but will not generated human readable source code.
44+
"setupCIWorkspace": Same as Dev but will not download any assets. This is useful in build servers as it is the fastest because it does the least work.
45+
46+
Tip:
47+
When using Decomp workspace, the Minecraft source code is NOT added to your workspace in a editable way. Minecraft is treated like a normal Library. Sources are there for documentation and research purposes and usually can be accessed under the 'referenced libraries' section of your IDE.
48+
49+
Forge source installation
50+
=========================
51+
MinecraftForge ships with this code and installs it as part of the forge
52+
installation process, no further action is required on your part.
53+
54+
LexManos' Install Video
55+
=======================
56+
https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be
57+
58+
For more details update more often refer to the Forge Forums:
59+
http://www.minecraftforge.net/forum/index.php/topic,14048.0.html

build.gradle

Lines changed: 59 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,75 @@
1+
2+
// For those who want the bleeding edge
13
buildscript {
24
repositories {
3-
mavenCentral()
5+
jcenter()
46
maven {
57
name = "forge"
68
url = "http://files.minecraftforge.net/maven"
79
}
8-
maven {
9-
name = "sonatype"
10-
url = "https://oss.sonatype.org/content/repositories/snapshots/"
11-
}
1210
}
1311
dependencies {
14-
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
12+
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
1513
}
1614
}
15+
apply plugin: 'net.minecraftforge.gradle.forge'
1716

18-
apply plugin: 'forge'
17+
/*
18+
// for people who want stable - not yet functional for MC 1.8.9 - we require the forgegradle 2.1 snapshot
19+
plugins {
20+
id "net.minecraftforge.gradle.forge" version "2.0.1"
21+
}
22+
*/
1923

20-
version = "A92"
24+
repositories {
25+
maven { // WAILA
26+
name 'Prof. Mobius'
27+
url 'http://mobiusstrip.eu/maven'
28+
}
29+
maven { // NEI and friends
30+
name 'Chickenbones'
31+
url 'http://chickenbones.net/maven/'
32+
}
33+
}
34+
35+
version = "A94"
2136
group= "vswe.stevesfactory" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
2237
archivesBaseName = "StevesFactoryManager"
2338

2439
minecraft {
25-
version = "1.7.10-10.13.0.1188"
26-
assetDir = "eclipse/assets"
40+
version = "1.8.9-11.15.1.1722"
41+
runDir = "run"
42+
43+
// the mappings can be changed at any time, and must be in the following format.
44+
// snapshot_YYYYMMDD snapshot are built nightly.
45+
// stable_# stables are built at the discretion of the MCP team.
46+
// Use non-default mappings at your own risk. they may not always work.
47+
// simply re-run your setup task after changing the mappings to update your workspace.
48+
mappings = "stable_20"
49+
}
50+
51+
dependencies {
52+
// you may put jars on which you depend on in ./libs
53+
// or you may define them like so..
54+
//compile "some.group:artifact:version:classifier"
55+
//compile "some.group:artifact:version"
56+
57+
// real examples
58+
//compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
59+
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
60+
61+
// the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
62+
//provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
63+
64+
// the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
65+
// except that these dependencies get remapped to your current MCP mappings
66+
//deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
67+
//deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
68+
69+
// for more info...
70+
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
71+
// http://www.gradle.org/docs/current/userguide/dependency_management.html
72+
compile 'mcp.mobius.waila:Waila:1.6.0-B3_1.8.8:dev'
2773
}
2874

2975
processResources
@@ -35,13 +81,13 @@ processResources
3581
// replace stuff in mcmod.info, nothing else
3682
from(sourceSets.main.resources.srcDirs) {
3783
include 'mcmod.info'
38-
84+
3985
// replace version and mcversion
4086
expand 'version':project.version, 'mcversion':project.minecraft.version
4187
}
42-
88+
4389
// copy everything else, thats not the mcmod.info
4490
from(sourceSets.main.resources.srcDirs) {
4591
exclude 'mcmod.info'
4692
}
47-
}
93+
}

gradle/wrapper/gradle-wrapper.jar

1.14 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jun 11 01:18:37 CEST 2014
1+
#Mon Sep 14 12:28:28 PDT 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip

logs/latest.log

Whitespace-only changes.

src/main/java/vswe/stevesfactory/GeneratedInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33

44
public class GeneratedInfo {
5-
public static final String version = /*@v*/"A92";
5+
public static final String version = /*@v*/"A94";
66
public static final boolean inDev = /*@d*/false;
77
}

src/main/java/vswe/stevesfactory/GuiHandler.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package vswe.stevesfactory;
22

3-
import cpw.mods.fml.common.network.IGuiHandler;
43
import net.minecraft.entity.player.EntityPlayer;
54
import net.minecraft.tileentity.TileEntity;
5+
import net.minecraft.util.BlockPos;
66
import net.minecraft.world.World;
7+
import net.minecraftforge.fml.common.network.IGuiHandler;
78
import vswe.stevesfactory.blocks.ITileEntityInterface;
89

910

@@ -14,7 +15,7 @@ public GuiHandler() {
1415

1516
@Override
1617
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
17-
TileEntity te = world.getTileEntity(x, y, z);
18+
TileEntity te = world.getTileEntity(new BlockPos(x, y, z));
1819

1920
if (te != null && te instanceof ITileEntityInterface) {
2021
return ((ITileEntityInterface)te).getContainer(te, player.inventory);
@@ -25,7 +26,7 @@ public Object getServerGuiElement(int ID, EntityPlayer player, World world, int
2526

2627
@Override
2728
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
28-
TileEntity te = world.getTileEntity(x, y, z);
29+
TileEntity te = world.getTileEntity(new BlockPos(x, y, z));
2930

3031
if (te != null && te instanceof ITileEntityInterface) {
3132
return ((ITileEntityInterface)te).getGui(te, player.inventory);

src/main/java/vswe/stevesfactory/Localization.java

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package vswe.stevesfactory;
22

33

4+
import net.minecraft.util.EnumFacing;
45
import net.minecraft.util.StatCollector;
56

67
public enum Localization {
@@ -14,12 +15,12 @@ public enum Localization {
1415
CONDITION_LONG,
1516
FLOW_CONTROL_SHORT,
1617
FLOW_CONTROL_LONG,
17-
LIQUID_INPUT_SHORT,
18-
LIQUID_INPUT_LONG,
19-
LIQUID_OUTPUT_SHORT,
20-
LIQUID_OUTPUT_LONG,
21-
LIQUID_CONDITION_SHORT,
22-
LIQUID_CONDITION_LONG,
18+
FLUID_INPUT_SHORT,
19+
FLUID_INPUT_LONG,
20+
FLUID_OUTPUT_SHORT,
21+
FLUID_OUTPUT_LONG,
22+
FLUID_CONDITION_SHORT,
23+
FLUID_CONDITION_LONG,
2324
REDSTONE_EMITTER_SHORT,
2425
REDSTONE_EMITTER_LONG,
2526
REDSTONE_CONDITION_SHORT,
@@ -105,7 +106,7 @@ public enum Localization {
105106
NO_CONDITION_ERROR,
106107
BUCKETS,
107108
MILLI_BUCKETS,
108-
LIQUIDS_MENU,
109+
FLUIDS_MENU,
109110
USE_ALL,
110111
REVERSED,
111112
LOOP_ORDER_MENU,
@@ -191,8 +192,8 @@ public enum Localization {
191192
VARIABLE_GREEN,
192193
VARIABLE_RED,
193194
VARIABLE_BLACK,
194-
NO_LIQUID_SELECTED,
195-
CHANGE_LIQUID,
195+
NO_FLUID_SELECTED,
196+
CHANGE_FLUID,
196197
EDIT_SETTING,
197198
NO_ITEM_SELECTED,
198199
CHANGE_ITEM,
@@ -378,17 +379,17 @@ public String toString() {
378379
return StatCollector.translateToLocal("gui." + StevesFactoryManager.UNLOCALIZED_START + name);
379380
}
380381

381-
public static Localization getForgeDirectionLocalization(int id) {
382-
switch (id) {
383-
case 0:
382+
public static Localization getDirectionLocalization(EnumFacing facing) {
383+
switch (facing) {
384+
case DOWN:
384385
return DOWN;
385-
case 1:
386+
case UP:
386387
return UP;
387-
case 2:
388+
case NORTH:
388389
return NORTH;
389-
case 3:
390+
case SOUTH:
390391
return SOUTH;
391-
case 4:
392+
case WEST:
392393
return WEST;
393394
default:
394395
return EAST;

0 commit comments

Comments
 (0)