Skip to content

Commit

Permalink
minor reworks/fixes
Browse files Browse the repository at this point in the history 
- updated name to reflect 4.5
- moved Seat registration to EntityHandler
- fixed an incorrect method call which prevented the jar from building
- added missing recipes for the 45 degree versions of the 32x and 29x
  • Loading branch information
@broscolotos
broscolotos committed Sep 6, 2024
1 parent 343e9bf commit 6e133fa
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/main/java/train/common/Traincraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ public void init(FMLInitializationEvent event) {
//proxy.getCape();

/* GUI handler initiation */
cpw.mods.fml.common.registry.EntityRegistry.registerModEntity(EntitySeat.class, "Seat", 16, Traincraft.instance,80,3,true);
tcLog.info("Initialize Gui");
NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
FMLCommonHandler.instance().bus().register(new CraftingHandler());
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/train/common/core/handlers/EntityHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package train.common.core.handlers;

import cpw.mods.fml.common.registry.EntityRegistry;
import ebf.tim.entities.EntitySeat;
import net.minecraft.entity.Entity;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
Expand All @@ -18,14 +19,16 @@
import train.common.entity.zeppelin.EntityZeppelinOneBalloon;
import train.common.entity.zeppelin.EntityZeppelinTwoBalloons;
import train.common.library.EnumTrains;
import train.common.library.TraincraftRegistry;

public class EntityHandler {
public static void init() {
EntityRegistry.registerModEntity(EntityZeppelinTwoBalloons.class, "zeppelin", EntityIds.ZEPPELIN, Traincraft.instance, 512, 1, true);//zepplin
EntityRegistry.registerModEntity(EntityBogie.class, "Entity Front Bogie", EntityIds.LOCOMOTIVE_BOGIE, Traincraft.instance, 512, 1, true);//front bogie
EntityRegistry.registerModEntity(EntityZeppelinOneBalloon.class, "zeppelin big", EntityIds.ZEPPELIN_BIG, Traincraft.instance, 512, 1, true);//zepplin big
EntityRegistry.registerModEntity(EntitySeat.class, "Seat", 16, Traincraft.instance,80,3,true);//seat
for(TrainRecord trains : EnumTrains.trains()){
TrainRecord.registerTransport(trains);
TraincraftRegistry.registerTransport(trains);
}
}
}
9 changes: 8 additions & 1 deletion src/main/java/train/common/core/handlers/RecipeHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ public static void initBlockRecipes() {
GameRegistry.addRecipe(new ItemStack(ItemIDs.tcRailLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailSmallStraight.item, 'T', ItemIDs.tcRailLargeTurn.item);
GameRegistry.addRecipe(new ItemStack(ItemIDs.tcRailVeryLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailSmallStraight.item, 'T', ItemIDs.tcRailVeryLargeTurn.item);
GameRegistry.addRecipe(new ItemStack(ItemIDs.tcRailSuperLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailSmallStraight.item, 'T', ItemIDs.tcRailSuperLargeTurn.item);
GameRegistry.addShapelessRecipe(new ItemStack(ItemIDs.tcRail45DegreeTurn9x20.item, 2), ItemIDs.tcRail29X29Turn.item);
GameRegistry.addShapelessRecipe(new ItemStack(ItemIDs.tcRail45DegreeTurn10x22.item,2),ItemIDs.tcRail32X32Turn.item);

GameRegistry.addRecipe(new ItemStack(ItemIDs.tcRailSmallParallelCurve.item, 1), " S ", "SS ", "S ", 'S', ItemIDs.tcRailSmallStraight.item);
GameRegistry.addRecipe(new ItemStack(ItemIDs.tcRailMediumParallelCurve.item, 1), " S ", "S ", " ", 'S', ItemIDs.tcRailSmallParallelCurve.item);
Expand Down Expand Up @@ -179,6 +181,8 @@ public static void initBlockRecipes() {
GameRegistry.addRecipe(new ItemStack(ItemIDs.tcRailEmbeddedLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailEmbeddedSmallStraight.item, 'T', ItemIDs.tcRailEmbeddedLargeTurn.item);
GameRegistry.addRecipe(new ItemStack(ItemIDs.tcRailEmbeddedVeryLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailEmbeddedSmallStraight.item, 'T', ItemIDs.tcRailEmbeddedVeryLargeTurn.item);
GameRegistry.addRecipe(new ItemStack(ItemIDs.tcRailEmbeddedSuperLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailEmbeddedSmallStraight.item, 'T', ItemIDs.tcRailEmbeddedSuperLargeTurn.item);
GameRegistry.addShapelessRecipe(new ItemStack(ItemIDs.tcRailEmbedded45DegreeTurn9x20.item, 2), ItemIDs.tcRailEmbedded29X29Turn.item);
GameRegistry.addShapelessRecipe(new ItemStack(ItemIDs.tcRailEmbedded45DegreeTurn10x22.item,2),ItemIDs.tcRailEmbedded32X32Turn.item);

GameRegistry.addRecipe(new ItemStack(ItemIDs.tcRailEmbeddedSmallParallelCurve.item, 1), " S ", "SS ", "S ", 'S', ItemIDs.tcRailEmbeddedSmallStraight.item);
GameRegistry.addRecipe(new ItemStack(ItemIDs.tcRailEmbeddedMediumParallelCurve.item, 1), " S ", "SS ", "S ", 'S', ItemIDs.tcRailEmbeddedSmallParallelCurve.item);
Expand Down Expand Up @@ -532,13 +536,14 @@ public static void initItemRecipes() {
TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailVeryLargeTurn.item, 1), "GG ","G "," ", Character.valueOf('G'), ItemIDs.tcRailLargeTurn.item );
TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailSuperLargeTurn.item, 1), "GG ","G "," ", Character.valueOf('G'), ItemIDs.tcRailVeryLargeTurn.item );
TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRail29X29Turn.item, 1), "GG ","G "," ", Character.valueOf('G'), ItemIDs.tcRailSuperLargeTurn.item );

TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRail32X32Turn.item, 1), "GG ","G "," ", Character.valueOf('G'), ItemIDs.tcRail29X29Turn.item );

TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailMedium45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailSmallStraight.item, 'T', ItemIDs.tcRailMediumTurn.item);
TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailSmallStraight.item, 'T', ItemIDs.tcRailLargeTurn.item);
TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailVeryLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailSmallStraight.item, 'T', ItemIDs.tcRailVeryLargeTurn.item);
TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailSuperLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailSmallStraight.item, 'T', ItemIDs.tcRailSuperLargeTurn.item);
TrainCraftingManager.instance.addShapelessRecipe(new ItemStack(ItemIDs.tcRail45DegreeTurn9x20.item, 2), ItemIDs.tcRail29X29Turn.item);
TrainCraftingManager.instance.addShapelessRecipe(new ItemStack(ItemIDs.tcRail45DegreeTurn10x22.item,2),ItemIDs.tcRail32X32Turn.item);

TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailSmallParallelCurve.item, 1), " S ", "SS ", "S ", 'S', ItemIDs.tcRailSmallStraight.item);
TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailMediumParallelCurve.item, 1), " S ", "S ", " ", 'S', ItemIDs.tcRailSmallParallelCurve.item);
Expand Down Expand Up @@ -607,6 +612,8 @@ public static void initItemRecipes() {
TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailEmbeddedLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailEmbeddedSmallStraight.item, 'T', ItemIDs.tcRailEmbeddedLargeTurn.item);
TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailEmbeddedVeryLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailEmbeddedSmallStraight.item, 'T', ItemIDs.tcRailEmbeddedVeryLargeTurn.item);
TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailEmbeddedSuperLarge45DegreeTurn.item, 1), "TG ", "G ", " ", 'G', ItemIDs.tcRailEmbeddedSmallStraight.item, 'T', ItemIDs.tcRailEmbeddedSuperLargeTurn.item);
TrainCraftingManager.instance.addShapelessRecipe(new ItemStack(ItemIDs.tcRailEmbedded45DegreeTurn9x20.item, 2), ItemIDs.tcRailEmbedded29X29Turn.item);
TrainCraftingManager.instance.addShapelessRecipe(new ItemStack(ItemIDs.tcRailEmbedded45DegreeTurn10x22.item,2),ItemIDs.tcRailEmbedded32X32Turn.item);

TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailEmbeddedSmallParallelCurve.item, 1), " S ", "SS ", "S ", 'S', ItemIDs.tcRailEmbeddedSmallStraight.item);
TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailEmbeddedMediumParallelCurve.item, 1), " S ", "SS ", "S ", 'S', ItemIDs.tcRailEmbeddedSmallParallelCurve.item);
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/mcmod.info
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[
{
"modid": "tc",
"name": "Traincraft - Community Edition",
"name": "Traincraft",
"description": "The Community Port of Traincraft, built off of version 020 by Hariesh with help from Bida and Dominik__1",
"version": "4.4.1_020-CE_7",
"version": "4.5_000",
"mcversion": "1.7.10",
"logoFile": "Logo.png",
"url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1287038",
Expand Down

0 comments on commit 6e133fa

Please sign in to comment.