Skip to content

Commit

Permalink
Merge 'TheDoctor1138/1.7-Community-4.3' into 1.7-Community-4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
EternalBlueFlame committed Oct 10, 2023
2 parents 1b037f1 + 6562896 commit 04a130b
Show file tree
Hide file tree
Showing 662 changed files with 72,752 additions and 26,064 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
Binary file added NotAddedContent-Open/cd754 - DONE/cd754.mtb
Binary file not shown.
Binary file added NotAddedContent-Open/cd754 - DONE/cd754_Red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed NotAddedContent-Open/cd754/cd754_Red.png
Diff not rendered.
File renamed without changes
File renamed without changes.
Binary file removed NotAddedContent-Open/j50/J50_Black.png
Diff not rendered.
Binary file removed NotAddedContent-Open/j50/J50_Cyan.png
Diff not rendered.
Binary file removed NotAddedContent-Open/j50/J50_Green.png
Diff not rendered.
Binary file removed NotAddedContent-Open/j50/J50_Grey.png
Diff not rendered.
Binary file removed NotAddedContent-Open/j50/J50_Lime.png
Diff not rendered.
Binary file removed NotAddedContent-Open/j50/j50.mtb
Binary file not shown.
File renamed without changes.
6 changes: 0 additions & 6 deletions NotAddedContent-Open/type 4/stats.txt

This file was deleted.

Binary file removed NotAddedContent-Open/type 4/type 4.mtb
Binary file not shown.
Binary file removed NotAddedContent-Open/type 4/type_4_Black.png
Diff not rendered.
Binary file removed NotAddedContent-Open/type 4/type_4_Blue.png
Diff not rendered.
Binary file removed NotAddedContent-Open/type 4/type_4_Green.png
Diff not rendered.
Binary file removed NotAddedContent-Open/type 4/type_4_Red.png
Diff not rendered.
Binary file removed NotAddedContent-Open/type 4/type_4_icon.png
Diff not rendered.
Binary file added NotAddedContent-Open/van - DONE/Van.mtb
Binary file not shown.
File renamed without changes.
Binary file removed NotAddedContent-Open/van/Van.mtb
Binary file not shown.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ buildscript {

maven {
name = "forge"
url = "https://maven.minecraftforge.net/"
url = "https://maven.minecraftforge.net/"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
}
dependencies {
classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') {
classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.1.+') {
changing = true
}
}
Expand Down
Binary file added raw_models/0-8-0 box tank.mtb
Binary file not shown.
File renamed without changes.
Binary file added raw_models/2-bil/2-bil tail.mtb
Binary file not shown.
Binary file added raw_models/2-bil/2-bil.mtb
Binary file not shown.
Binary file added raw_models/Bagnall_shunter_0-4-0.mtb
Binary file not shown.
Binary file modified raw_models/Class 321/Class_321.mtb
Binary file not shown.
Binary file added raw_models/Class 321/Class_321_Motor_Car.mtb
Binary file not shown.
Binary file modified raw_models/Class 321/Class_321_Trailer_Car.mtb
Binary file not shown.
Binary file added raw_models/Class_142.mtb
Binary file not shown.
Binary file added raw_models/Class_230.mtb
Binary file not shown.
Binary file added raw_models/Class_230_Middle.mtb
Binary file not shown.
Binary file added raw_models/Class_374_Buffet.mtb
Binary file not shown.
Binary file added raw_models/Class_374_Front.mtb
Binary file not shown.
Binary file added raw_models/Class_374_Premier_Panto.mtb
Binary file not shown.
Binary file added raw_models/Class_374_Standard_Panto.mtb
Binary file not shown.
Binary file added raw_models/Class_378.mtb
Binary file not shown.
Binary file added raw_models/Class_378_Middle.mtb
Binary file not shown.
Binary file added raw_models/Class_387.mtb
Binary file not shown.
Binary file added raw_models/Class_387_Coach.mtb
Binary file not shown.
Binary file added raw_models/Class_387_Panto.mtb
Binary file not shown.
Binary file added raw_models/Class_389.mtb
Binary file not shown.
Binary file added raw_models/Class_389_Middle.mtb
Binary file not shown.
Binary file added raw_models/Compound/compound engine.mtb
Binary file not shown.
Binary file added raw_models/Compound/compound tender.mtb
Binary file not shown.
Binary file not shown.
Binary file added raw_models/Sentinel Y3.mtb
Binary file not shown.
Binary file added raw_models/Van.mtb
Binary file not shown.
File renamed without changes.
Binary file not shown.
Binary file added raw_models/class 143.mtb
Binary file not shown.
Binary file added raw_models/class 144 coach.mtb
Binary file not shown.
Binary file added raw_models/class_442_DTS.mtb
Binary file not shown.
Binary file added raw_models/class_442_MBLS.mtb
Binary file not shown.
Binary file added raw_models/class_442_TS.mtb
Binary file not shown.
Binary file added raw_models/j50 mk2.mtb
Binary file not shown.
Binary file not shown.
Binary file added raw_models/thumper and epb stuff/epb tail v2.mtb
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import train.common.library.Info;

public class ItemRenderEmbeddedStopper implements IItemRenderer {
private static final ResourceLocation texture = new ResourceLocation(Info.resourceLocation,Info.modelTexPrefix + "buffer.png");
private static final ResourceLocation texture = new ResourceLocation(Info.resourceLocation,Info.modelTexPrefix + "embedded_buffer.png");
private static final ModelEmbeddedStopper embeddedStopper = new ModelEmbeddedStopper(1F);

public ItemRenderEmbeddedStopper() {
Expand Down
126 changes: 106 additions & 20 deletions src/main/java/train/client/render/RenderEnum.java

Large diffs are not rendered by default.

38 changes: 29 additions & 9 deletions src/main/java/train/client/render/models/Model10tonBrakeVan.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
package train.client.render.models; //Path where the model is located


import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import org.lwjgl.opengl.GL11;
import tmt.ModelConverter;
import tmt.ModelRendererTurbo;

Expand Down Expand Up @@ -219,21 +222,21 @@ private void initbodyModel_1()
bodyModel[184] = new ModelRendererTurbo(this, 41, 105, textureX, textureY); // Box 83
bodyModel[185] = new ModelRendererTurbo(this, 41, 105, textureX, textureY); // Box 83
bodyModel[186] = new ModelRendererTurbo(this, 41, 105, textureX, textureY); // Box 83
bodyModel[187] = new ModelRendererTurbo(this, 417, 49, textureX, textureY); // lamp
bodyModel[188] = new ModelRendererTurbo(this, 417, 49, textureX, textureY); // lamp
bodyModel[189] = new ModelRendererTurbo(this, 417, 49, textureX, textureY); // lamp
bodyModel[190] = new ModelRendererTurbo(this, 417, 49, textureX, textureY); // lamp
bodyModel[187] = new ModelRendererTurbo(this, 417, 49, textureX, textureY, "lamp"); // lamp
bodyModel[188] = new ModelRendererTurbo(this, 417, 49, textureX, textureY, "lamp"); // lamp
bodyModel[189] = new ModelRendererTurbo(this, 417, 49, textureX, textureY, "lamp"); // lamp
bodyModel[190] = new ModelRendererTurbo(this, 417, 49, textureX, textureY, "lamp"); // lamp
bodyModel[191] = new ModelRendererTurbo(this, 177, 81, textureX, textureY); // Box 101
bodyModel[192] = new ModelRendererTurbo(this, 193, 1, textureX, textureY); // Box 102
bodyModel[193] = new ModelRendererTurbo(this, 337, 81, textureX, textureY); // Box 103
bodyModel[194] = new ModelRendererTurbo(this, 225, 1, textureX, textureY); // Box 111
bodyModel[195] = new ModelRendererTurbo(this, 337, 81, textureX, textureY); // Box 103
bodyModel[196] = new ModelRendererTurbo(this, 337, 81, textureX, textureY); // Box 103
bodyModel[197] = new ModelRendererTurbo(this, 337, 81, textureX, textureY); // Box 103
bodyModel[198] = new ModelRendererTurbo(this, 417, 49, textureX, textureY); // lamp
bodyModel[199] = new ModelRendererTurbo(this, 417, 49, textureX, textureY); // lamp
bodyModel[200] = new ModelRendererTurbo(this, 417, 49, textureX, textureY); // lamp
bodyModel[201] = new ModelRendererTurbo(this, 417, 49, textureX, textureY); // lamp
bodyModel[198] = new ModelRendererTurbo(this, 417, 49, textureX, textureY, "lamp"); // lamp
bodyModel[199] = new ModelRendererTurbo(this, 417, 49, textureX, textureY, "lamp"); // lamp
bodyModel[200] = new ModelRendererTurbo(this, 417, 49, textureX, textureY, "lamp"); // lamp
bodyModel[201] = new ModelRendererTurbo(this, 417, 49, textureX, textureY, "lamp"); // lamp
bodyModel[202] = new ModelRendererTurbo(this, 177, 81, textureX, textureY); // Box 101
bodyModel[203] = new ModelRendererTurbo(this, 193, 1, textureX, textureY); // Box 102
bodyModel[204] = new ModelRendererTurbo(this, 337, 81, textureX, textureY); // Box 103
Expand Down Expand Up @@ -881,4 +884,21 @@ private void initbodyModel_1()
bodyModel[211].addShapeBox(0F, 0F, 0F, 1, 19, 1, 0F,0F, 0F, 0F, 0.05F, 0F, 0F, 0.05F, 0F, 0.05F, 0F, 0F, 0.05F, 0F, 0F, 0F, 0.05F, 0F, 0F, 0.05F, 0F, 0.05F, 0F, 0F, 0.05F); // Box 83
bodyModel[211].setRotationPoint(20F, -19F, -4F);
}
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {

for (int i = 0; i < 212; i++) {
if (bodyModel[i].boxName != null && bodyModel[i].boxName.contains("lamp")) {
Minecraft.getMinecraft().entityRenderer.disableLightmap(1D);
bodyModel[i].render(f5);
Minecraft.getMinecraft().entityRenderer.enableLightmap(1D);
} else if (bodyModel[i].boxName != null && bodyModel[i].boxName.contains("cull")) {
GL11.glDisable(GL11.GL_CULL_FACE);
bodyModel[i].render(f5);
GL11.glEnable(GL11.GL_CULL_FACE);
} else {
bodyModel[i].render(f5);
}
}
}

}
Loading

0 comments on commit 04a130b

Please sign in to comment.