Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated for CCL
  • Loading branch information
MrTJP committed Jun 14, 2014
1 parent a49cc93 commit e2a371f
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 48 deletions.
18 changes: 11 additions & 7 deletions README.md
Expand Up @@ -32,12 +32,16 @@ Should you be able to describe your proposed gate in this format, create a featu

Developing:
----------
Setup is slightly different depending on what system and IDE you use.
This assumes you know how to run gradle commands on your system.
The base command, `./gradlew` being used below is for Linux or Unix based systems. For windows, this would simply change to `gradlew`.
Of course, if you dont need to use the wrapper (as in, you have gradle installed on your system), you can simply go right to `gradle`.


1. Clone repository to empty folder.
2. Cd to the repository.
3. Run `install-dependencies` to set up an environment.
4. Link downloaded lib files as libraries in eclipse.
5. Link `common` and `resources` as source folders in eclipse.
6. Edit your code.
7. Use a debug run to test.
8. After its bug free, you may submit it as a Pull Request to the main repo.
2. Cd to the repository (folder where `src` and `resources` are located).
3. Run `./gradlew setupDecompWorkspace` to set up an environment.
4. Run `./gradlew eclipse` or `./gradlew idea` appropriately.
5. Open your IDE using the generated files (i.e., for IDEA, a ProjectRed.ipr is generated in `./`)
6. Edit, run, and debug your new code.
7. Once its bug free and working, you may submit it as a PR to the main repo.
12 changes: 6 additions & 6 deletions build.gradle
Expand Up @@ -138,7 +138,7 @@ task integrationJar(type: Jar, dependsOn: reobf) {
project.ext.baseExcludes.addAll(includes)
}
version = project.ext.jarVer
classifier = 'Integration'
appendix = 'Integration'
}

task lightingJar(type: Jar, dependsOn: reobf) {
Expand All @@ -155,7 +155,7 @@ task lightingJar(type: Jar, dependsOn: reobf) {
project.ext.baseExcludes.addAll(includes)
}
version = project.ext.jarVer
classifier = 'Lighting'
appendix = 'Lighting'
}

task mechanicalJar(type: Jar, dependsOn: reobf) {
Expand All @@ -175,7 +175,7 @@ task mechanicalJar(type: Jar, dependsOn: reobf) {
project.ext.baseExcludes.addAll(includes)
}
version = project.ext.jarVer
classifier = 'Mechanical'
appendix = 'Mechanical'
}

task worldJar(type: Jar, dependsOn: reobf) {
Expand All @@ -191,7 +191,7 @@ task worldJar(type: Jar, dependsOn: reobf) {
project.ext.baseExcludes.addAll(includes)
}
version = project.ext.jarVer
classifier = 'World'
appendix = 'World'
}

task compatJar(type: Jar, dependsOn: reobf) {
Expand All @@ -212,7 +212,7 @@ task compatJar(type: Jar, dependsOn: reobf) {
attributes 'FMLCorePluginContainsFMLMod': 'true'
}
version = project.ext.jarVer
classifier = 'Compat'
appendix = 'Compat'
}

task baseJar(type: Jar, dependsOn: reobf) {
Expand All @@ -226,7 +226,7 @@ task baseJar(type: Jar, dependsOn: reobf) {
attributes 'FMLCorePluginContainsFMLMod': 'true'
}
version = project.ext.jarVer
classifier = 'Base'
appendix = 'Base'

}

Expand Down
6 changes: 3 additions & 3 deletions build.properties
@@ -1,10 +1,10 @@
mod_version=4.3.7
mod_version=4.4.0_beta

mc_version=1.7.2
forge_version=10.12.2.1121

ccl_version=1.1.0.73
ccl_version=1.1.1.85
ccc_version=1.0.0
fmp_version=1.1.0.268
fmp_version=1.1.0.283

nei_version=1.0.1
3 changes: 2 additions & 1 deletion resources/Changelog
@@ -1,4 +1,5 @@
[dev]v4.3.8
[dev]v4.4.0
- PORT: Minecraft 1.7.2
- ADDED: Version checking config
- FIX: Pipe priority sorting crash
- FIX: Invert cell inventory render
Expand Down
Expand Up @@ -158,7 +158,7 @@ trait TWidgetSideHighlight extends WidgetSideSelect
CCRenderState.baseColour = color
CCRenderState.alphaOverride = 64
CCRenderState.startDrawing()
TWidgetSideHighlight.highlights(side).render(CCRenderState.colourAttrib)
TWidgetSideHighlight.highlights(side).render()
CCRenderState.draw()

GL11.glEnable(GL11.GL_DEPTH_TEST)
Expand Down
3 changes: 2 additions & 1 deletion src/mrtjp/projectred/exploration/items.scala
Expand Up @@ -246,9 +246,10 @@ class ItemGemSaw(val tool:ToolVal) extends ItemCraftingDamage("projectred.explor
setCreativeTab(ProjectRedExploration.tabExploration)

override def getCuttingStrength(item:ItemStack) = tool.mat.getHarvestLevel
override def registerIcons(reg:IIconRegister){}
}

class ItemGemSickle(override val tool:ToolVal) extends ItemTool(3, tool.mat, new java.util.TreeSet) with TGemTool
class ItemGemSickle(override val tool:ToolVal) extends ItemTool(3, tool.mat, new java.util.HashSet) with TGemTool
{
private val radiusLeaves = 1
private val radiusCrops = 2
Expand Down
6 changes: 3 additions & 3 deletions src/mrtjp/projectred/illumination/lightobj.scala
Expand Up @@ -106,7 +106,7 @@ object LightObjLantern extends LightObject with TLightRenderHelper
{
val icon = new IconTransformation(if (isOn) on(color) else off(color))
TextureUtils.bindAtlas(0)
lModels(part.side).render(pos.translation(), icon, CCRenderState.colourAttrib)
lModels(part.side).render(pos.translation(), icon)
}

@SideOnly(Side.CLIENT)
Expand Down Expand Up @@ -172,7 +172,7 @@ object LightObjFixture extends LightObject with TLightRenderHelper
{
val icon = new IconTransformation(if (isOn) LightObjLantern.on(color) else LightObjLantern.off(color))
TextureUtils.bindAtlas(0)
lModels(part.side).render(pos.translation(), icon, CCRenderState.colourAttrib)
lModels(part.side).render(pos.translation(), icon)
}

@SideOnly(Side.CLIENT)
Expand Down Expand Up @@ -236,7 +236,7 @@ object LightObjCage extends LightObject with TLightRenderHelper
{
val icon = new IconTransformation(if (isOn) LightObjLantern.on(color) else LightObjLantern.off(color))
TextureUtils.bindAtlas(0)
lModels(part.side).render(pos.translation(), icon, CCRenderState.colourAttrib)
lModels(part.side).render(pos.translation(), icon)
}

@SideOnly(Side.CLIENT)
Expand Down
21 changes: 6 additions & 15 deletions src/mrtjp/projectred/integration/ComponentStore.java
Expand Up @@ -195,15 +195,6 @@ public static CCModel reverseFacing(CCModel m)

public static abstract class ComponentModel
{
private static IVertexOperation noColour = new ColourMultiplier(-1);
protected static IVertexOperation colour = noColour;

public static void setModelColour(boolean flag)
{
if (flag) colour = CCRenderState.colourAttrib;
else colour = noColour;
}

public abstract void renderModel(Transformation t, int orient);

public void registerTextures(IIconRegister r)
Expand All @@ -224,7 +215,7 @@ public static class BaseComponentModel extends ComponentModel
@Override
public void renderModel(Transformation t, int orient)
{
models[orient%24].render(t, new IconTransformation(baseIcon), colour);
models[orient%24].render(t, new IconTransformation(baseIcon));
}
}

Expand All @@ -248,7 +239,7 @@ public SingleComponentModel(CCModel m, Vector3 pos)
@Override
public void renderModel(Transformation t, int orient)
{
models[orient].render(t, getUVT(), colour);
models[orient].render(t, getUVT());
}
}

Expand Down Expand Up @@ -276,7 +267,7 @@ public MultiComponentModel(Vector3 pos, CCModel... m)
@Override
public void renderModel(Transformation t, int orient)
{
models[state][orient].render(t, getUVT(), colour);
models[state][orient].render(t, getUVT());
}
}

Expand Down Expand Up @@ -572,7 +563,7 @@ public void bind(WireComponentModel parent)
@Override
public void renderModel(Transformation t, int orient)
{
models[orient].render(t, new IconTransformation(icons[parent.disabled ? 0 : parent.on ? 2 : 1]), colour);
models[orient].render(t, new IconTransformation(icons[parent.disabled ? 0 : parent.on ? 2 : 1]));
}

@Override
Expand Down Expand Up @@ -869,7 +860,7 @@ public BusXcvrPanelModel(double x, double z, boolean flip)
public void renderModel(Transformation t, int orient)
{
IconTransformation icont = new IconTransformation(busXcvrIcon);
models[orient].render(t, icont, colour);
models[orient].render(t, icont);

Vector3 displayPos = pos.copy();
if (orient >= 24)// flipped x
Expand All @@ -879,7 +870,7 @@ public void renderModel(Transformation t, int orient)
displayT = displayT.with(displayPos.translation()).with(orientT(orient%24)).with(t);
for (int i = 0; i < 16; i++)
if ((signal&1<<i) != 0)
displayModels[i].render(displayT, icont, PlanarLightModel.standardLightModel, colour);
displayModels[i].render(displayT, icont, PlanarLightModel.standardLightModel);
}
}

Expand Down
3 changes: 0 additions & 3 deletions src/mrtjp/projectred/integration/RenderGate.java
Expand Up @@ -59,15 +59,13 @@ public static void registerIcons(IIconRegister r)
public static void renderStatic(GatePart gate, Vector3 pos)
{
GateRenderer r = renderers[gate.subID&0xFF];
ComponentModel.setModelColour(true); //use model vert colours
r.prepare(gate);
r.renderStatic(pos.translation(), gate.orientation&0xFF);
}

public static void renderDynamic(GatePart gate, Vector3 pos, float frame)
{
GateRenderer r = renderers[gate.subID&0xFF];
ComponentModel.setModelColour(false);
if (r.hasSpecials())
{
r.prepareDynamic(gate, frame);
Expand All @@ -78,7 +76,6 @@ public static void renderDynamic(GatePart gate, Vector3 pos, float frame)
public static void renderInv(Transformation t, int id)
{
GateRenderer r = renderers[id];
ComponentModel.setModelColour(false);
TextureUtils.bindAtlas(0);
r.prepareInv();
CCRenderState.startDrawing();
Expand Down
2 changes: 1 addition & 1 deletion src/mrtjp/projectred/transmission/RenderFramedWire.scala
Expand Up @@ -44,7 +44,7 @@ object RenderFramedWire
val uvt = new IconTransformation(w.getIcon)
val m = ColourMultiplier.instance(w.renderHue)

val ops = Seq[IVertexOperation](pos.translation(), uvt, CCRenderState.colourAttrib)
val ops = Seq[IVertexOperation](pos.translation(), uvt)
val wireOps = ops :+ m

if (w.material == 0)
Expand Down
2 changes: 1 addition & 1 deletion src/mrtjp/projectred/transmission/RenderWire.scala
Expand Up @@ -68,7 +68,7 @@ object RenderWire
{
getOrGenerateModel(modelKey(w)).render(
pos.translation(), new IconTransformation(w.getIcon),
ColourMultiplier.instance(w.renderHue), CCRenderState.colourAttrib)
ColourMultiplier.instance(w.renderHue))
}

def renderInv(thickness:Int, hue:Int, ops:IVertexOperation*)
Expand Down
12 changes: 6 additions & 6 deletions src/mrtjp/projectred/transportation/piperenders.scala
Expand Up @@ -57,15 +57,15 @@ object RenderPipe
{
if ((connMap>>a*2) == 3)
{
centerModels(a).render(t, uvt, CCRenderState.colourAttrib)
centerModels(a).render(t, uvt)
}
}
else centerModels(3).render(t, uvt, CCRenderState.colourAttrib)
else centerModels(3).render(t, uvt)

for (s <- 0 until 6) if ((connMap&1<<s) != 0)
{
uvt = new IconTransformation(p.getIcon(s))
sideModels(s).render(t, uvt, CCRenderState.colourAttrib)
sideModels(s).render(t, uvt)
}
if (p.material) renderRSWiring(p, t, p.signal)
}
Expand All @@ -78,12 +78,12 @@ object RenderPipe

if (Integer.bitCount(connMap) == 2 && ((connMap&3) == 3 || (connMap&12) == 12 || (connMap&48) == 48)) for (a <- 0 until 3)
{
if ((connMap>>a*2) == 3) centerModelsRS(a).render(t, uvt2, colour, CCRenderState.colourAttrib)
if ((connMap>>a*2) == 3) centerModelsRS(a).render(t, uvt2, colour)
}
else centerModelsRS(3).render(t, uvt2, colour, CCRenderState.colourAttrib)
else centerModelsRS(3).render(t, uvt2, colour)

for (s <- 0 until 6) if ((connMap&1<<s) != 0)
sideModelsRS(s).render(t, uvt2, colour, CCRenderState.colourAttrib)
sideModelsRS(s).render(t, uvt2, colour)
}

def renderBreakingOverlay(icon:IIcon, pipe:FlowingPipePart)
Expand Down

0 comments on commit e2a371f

Please sign in to comment.