Fix lang and parts

This commit is contained in:
drcrazy 2019-07-18 00:49:07 +03:00
parent db9db5b77d
commit 9ac21ded30
8 changed files with 366 additions and 994 deletions

View file

@ -28,6 +28,8 @@ import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
import net.minecraft.block.DispenserBlock; import net.minecraft.block.DispenserBlock;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -53,19 +55,19 @@ public class TechReborn implements ModInitializer {
public static CommonProxy proxy = new CommonProxy(); public static CommonProxy proxy = new CommonProxy();
public static TechReborn INSTANCE; public static TechReborn INSTANCE;
public static final ItemGroup ITEMGROUP = FabricItemGroupBuilder.build(new Identifier("techreborn", "item_group"), TRContent.Parts.MACHINE_PARTS::getStack); public static ItemGroup ITEMGROUP = FabricItemGroupBuilder.build(
new Identifier("techreborn", "item_group"),
() -> new ItemStack(TRContent.NUKE));
@Override @Override
public void onInitialize() { public void onInitialize() {
INSTANCE = this; INSTANCE = this;
// RegistrationManager registrationManager = new RegistrationManager("techreborn", getClass());
RegistrationManager registrationManager = new RegistrationManager("techreborn", getClass()); // TechRebornAPI.subItemRetriever = new SubItemRetriever();
// Done like this to load them here
TechRebornAPI.subItemRetriever = new SubItemRetriever();
//Done like this to load them here
ModFluids.values(); ModFluids.values();
//Done to force the class to load // Done to force the class to load
ModRecipes.GRINDER.getName(); ModRecipes.GRINDER.getName();
ClientboundPackets.init(); ClientboundPackets.init();
@ -77,9 +79,9 @@ public class TechReborn implements ModInitializer {
// Registers Chest Loot // Registers Chest Loot
ModLoot.init(); ModLoot.init();
//MinecraftForge.EVENT_BUS.register(new ModLoot()); // MinecraftForge.EVENT_BUS.register(new ModLoot());
// Sounds // Sounds
//TODO 1.13 registry events // TODO 1.13 registry events
ModSounds.init(); ModSounds.init();
// Client only init, needs to be done before parts system // Client only init, needs to be done before parts system
proxy.init(); proxy.init();
@ -91,7 +93,7 @@ public class TechReborn implements ModInitializer {
StackWIPHandler.setup(); StackWIPHandler.setup();
// WorldGen // WorldGen
//GameRegistry.registerWorldGenerator(new OilLakeGenerator(), 0); // GameRegistry.registerWorldGenerator(new OilLakeGenerator(), 0);
// Register Gui Handler // Register Gui Handler
// Event busses // Event busses
// MinecraftForge.EVENT_BUS.register(new BlockBreakHandler()); // MinecraftForge.EVENT_BUS.register(new BlockBreakHandler());
@ -102,7 +104,7 @@ public class TechReborn implements ModInitializer {
GuiHandler.register(); GuiHandler.register();
//Village stuff // Village stuff
// if (ConfigTechReborn.enableRubberTreePlantation) { // if (ConfigTechReborn.enableRubberTreePlantation) {
// VillagerRegistry.instance().registerVillageCreationHandler(new VillagePlantaionHandler()); // VillagerRegistry.instance().registerVillageCreationHandler(new VillagePlantaionHandler());
// //MapGenStructureIO.registerStructureComponent(VillageComponentRubberPlantaion.class, new ResourceLocation(MOD_ID, "rubberplantation").toString()); // //MapGenStructureIO.registerStructureComponent(VillageComponentRubberPlantaion.class, new ResourceLocation(MOD_ID, "rubberplantation").toString());
@ -120,7 +122,6 @@ public class TechReborn implements ModInitializer {
ModRecipes.postInit(); ModRecipes.postInit();
LOGGER.info("TechReborn setup done!"); LOGGER.info("TechReborn setup done!");
} }

View file

@ -90,7 +90,7 @@ public class ModRegistry {
RebornRegistry.registerBlock(value.frame, itemGroup); RebornRegistry.registerBlock(value.frame, itemGroup);
RebornRegistry.registerBlock(value.casing, itemGroup); RebornRegistry.registerBlock(value.casing, itemGroup);
}); });
Arrays.stream(TRContent.SolarPanels.values()).forEach(value -> RebornRegistry.registerBlock(value.block, itemGroup)); Arrays.stream(SolarPanels.values()).forEach(value -> RebornRegistry.registerBlock(value.block, itemGroup));
Arrays.stream(Cables.values()).forEach(value -> RebornRegistry.registerBlock(value.block, itemGroup)); Arrays.stream(Cables.values()).forEach(value -> RebornRegistry.registerBlock(value.block, itemGroup));
Arrays.stream(Machine.values()).forEach(value -> RebornRegistry.registerBlock(value.block, itemGroup)); Arrays.stream(Machine.values()).forEach(value -> RebornRegistry.registerBlock(value.block, itemGroup));

View file

@ -618,9 +618,11 @@ public class TRContent {
, WATER_COOLANT_CELL_10K, , WATER_COOLANT_CELL_10K,
WATER_COOLANT_CELL_30K, WATER_COOLANT_CELL_30K,
WATER_COOLANT_CELL_60K, WATER_COOLANT_CELL_60K,
HELIUM_COOLANT_CELL_60K, HELIUM_COOLANT_CELL_60K,
HELIUM_COOLANT_CELL_360K,
HELIUM_COOLANT_CELL_180K, HELIUM_COOLANT_CELL_180K,
HELIUM_COOLANT_CELL_360K,
NAK_COOLANT_CELL_60K, NAK_COOLANT_CELL_60K,
NAK_COOLANT_CELL_180K, NAK_COOLANT_CELL_180K,
NAK_COOLANT_CELL_360K, NAK_COOLANT_CELL_360K,

File diff suppressed because it is too large Load diff

View file

@ -10,7 +10,7 @@
"item": "techreborn:advanced_circuit" "item": "techreborn:advanced_circuit"
}, },
"P": { "P": {
"item": "techreborn:aluminium_plate" "item": "techreborn:aluminum_plate"
}, },
"B": { "B": {
"item": "techreborn:lithium_ion_battery" "item": "techreborn:lithium_ion_battery"

View file

@ -10,7 +10,7 @@
"item": "techreborn:insulated_gold_cable" "item": "techreborn:insulated_gold_cable"
}, },
"P": { "P": {
"item": "techreborn:aluminium_plate" "item": "techreborn:aluminum_plate"
}, },
"F": { "F": {
"item": "techreborn:cell" "item": "techreborn:cell"

View file

@ -1,8 +1,8 @@
{ {
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"DC", "DC ",
"DC", "DC ",
"GLG" "GLG"
], ],
"key": { "key": {

View file

@ -1,8 +1,8 @@
{ {
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"DT", "DT ",
"DT", "DT ",
"DCB" "DCB"
], ],
"key": { "key": {