Skip to content
This repository has been archived by the owner on May 25, 2024. It is now read-only.

Add Draconic Evolution Fusion Crafter (moved from EMT) #101

Merged
merged 14 commits into from
Oct 30, 2023
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//version: 1696952014
//version: 1697697256
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
Expand Down Expand Up @@ -798,7 +798,7 @@ dependencies {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7')
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
}

java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
Expand Down
30 changes: 15 additions & 15 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@
*/

dependencies {
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.36:dev')
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.71:dev')
api("com.github.GTNewHorizons:EnderCore:0.2.18:dev")
api("com.github.GTNewHorizons:EnderIO:2.5.2:dev")
api("com.github.GTNewHorizons:EnderIO:2.5.3:dev")
api("com.github.GTNewHorizons:ForestryMC:4.6.14:dev")
api("com.github.GTNewHorizons:ModularUI:1.1.20:dev")
api("com.github.GTNewHorizons:Mobs-Info:0.1.8-GTNH:dev")
api("com.github.GTNewHorizons:ModularUI:1.1.22:dev")
api("com.github.GTNewHorizons:Mobs-Info:0.1.10-GTNH:dev")
devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.7.9-GTNH:dev")
//compileOnly("curse.maven:extrautilities-225561:2264384") {
// transitive = false
//}
compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.17:dev")
compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.24:dev")
{
transitive = false
}
Expand All @@ -61,15 +61,15 @@ dependencies {
{
transitive = false
}
compileOnly("com.github.GTNewHorizons:bartworks:0.8.8:dev")
compileOnly("com.github.GTNewHorizons:bartworks:0.8.9:dev")
{
transitive = false
}
compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.18:dev")
compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.32:dev")
{
transitive = false
}
compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.0-GTNH:dev")
compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.2-GTNH:dev")
{
transitive = false
}
Expand All @@ -83,17 +83,17 @@ dependencies {
*/

// For testing
//runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.0-GTNH:dev")
//runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.10.17:dev")
//runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.2-GTNH:dev")
//runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.10.24:dev")
//runtimeOnly("com.github.GTNewHorizons:harvestcraft:1.1.1-GTNH:dev")
//runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.18:dev")
//runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.7.0-GTNH:dev")
//runtimeOnly("com.github.GTNewHorizons:bartworks:0.8.8:dev")
//runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.32:dev")
//runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.7.1-GTNH:dev")
//runtimeOnly("com.github.GTNewHorizons:bartworks:0.8.9:dev")
//runtimeOnly("com.github.GTNewHorizons:CraftTweaker:3.2.13:dev")
//api("com.github.GTNewHorizons:SpecialMobs:3.4.3:dev")
//api("com.github.GTNewHorizons:twilightforest:2.5.0:dev")
//api("com.github.GTNewHorizons:twilightforest:2.5.1:dev")
//api("com.github.GTNewHorizons:EnderZoo:1.0.23:dev")
//runtimeOnly("com.github.GTNewHorizons:Draconic-Evolution:1.1.19-GTNH:dev")
runtimeOnly("com.github.GTNewHorizons:Draconic-Evolution:1.2.0-GTNH:dev")
//runtimeOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
//runtimeOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev")
//api("curse.maven:witchery-69673:2234410")
Expand Down
1 change: 1 addition & 0 deletions src/main/java/kubatech/api/LoaderReference.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ public class LoaderReference {
public static final boolean Avaritia = Loader.isModLoaded("Avaritia");
public static final boolean ProjRedIllumination = Loader.isModLoaded("ProjRed|Illumination");
public static final boolean RandomThings = Loader.isModLoaded("RandomThings");
public static final boolean ElectroMagicTools = Loader.isModLoaded("EMT");
}
15 changes: 14 additions & 1 deletion src/main/java/kubatech/api/enums/ItemList.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public enum ItemList implements IItemContainer {
ExtremeExterminationChamber,
ExtremeIndustrialApiary,
ExtremeIndustrialGreenhouse,
DraconicEvolutionFusionCrafter,
LegendaryBlackTea,
LegendaryButterflyTea,
LegendaryEarlGrayTea,
Expand Down Expand Up @@ -59,7 +60,19 @@ public enum ItemList implements IItemContainer {
TeaAcceptorResearchNote,
TeaAcceptor,
TeaStorage,
Beeeeee;
Beeeeee,
DEFCCasingBase,
DEFCCasingT1,
DEFCCasingT2,
DEFCCasingT3,
DEFCCasingT4,
DEFCCasingT5,
DEFCDraconicSchematic,
DEFCWyvernSchematic,
DEFCAwakenedSchematic,
DEFCChaoticSchematic,

;

private ItemStack mStack;
private boolean mHasNotBeenSet = true;
Expand Down
23 changes: 20 additions & 3 deletions src/main/java/kubatech/kubatech.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
Expand All @@ -46,9 +47,11 @@
import cpw.mods.fml.common.event.FMLServerStoppedEvent;
import cpw.mods.fml.common.event.FMLServerStoppingEvent;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import kubatech.api.enums.ItemList;
import kubatech.api.helpers.ReflectionHelper;
import kubatech.loaders.BlockLoader;
import kubatech.network.CustomTileEntityPacket;
import kubatech.network.LoadConfigPacket;

Expand Down Expand Up @@ -101,9 +104,13 @@ public String getTranslatedTabLabel() {
@Override
public void displayAllReleventItems(List p_78018_1_) {
super.displayAllReleventItems(p_78018_1_);
p_78018_1_.add(ItemList.ExtremeExterminationChamber.get(1));
p_78018_1_.add(ItemList.ExtremeIndustrialApiary.get(1));
p_78018_1_.add(ItemList.ExtremeIndustrialGreenhouse.get(1));
if (ItemList.ExtremeExterminationChamber.hasBeenSet())
p_78018_1_.add(ItemList.ExtremeExterminationChamber.get(1));
if (ItemList.ExtremeIndustrialApiary.hasBeenSet()) p_78018_1_.add(ItemList.ExtremeIndustrialApiary.get(1));
if (ItemList.ExtremeIndustrialGreenhouse.hasBeenSet())
p_78018_1_.add(ItemList.ExtremeIndustrialGreenhouse.get(1));
if (ItemList.DraconicEvolutionFusionCrafter.hasBeenSet())
p_78018_1_.add(ItemList.DraconicEvolutionFusionCrafter.get(1));
}
};

Expand Down Expand Up @@ -176,6 +183,16 @@ public void loadComplete(FMLLoadCompleteEvent event) {
proxy.loadComplete(event);
}

@Mod.EventHandler
public void missingMappings(FMLMissingMappingsEvent event) {
for (FMLMissingMappingsEvent.MissingMapping missingMapping : event.getAll()) {
if (missingMapping.name.equals("EMT:EMT_GTBLOCK_CASEING")) {
if (missingMapping.type == GameRegistry.Type.BLOCK) missingMapping.remap(BlockLoader.defcCasingBlock);
else missingMapping.remap(Item.getItemFromBlock(BlockLoader.defcCasingBlock));
}
}
}

public static void debug(String message) {
LOG.debug(message);
}
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/kubatech/loaders/BlockLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,19 @@

import cpw.mods.fml.common.registry.GameRegistry;
import kubatech.api.enums.ItemList;
import kubatech.loaders.block.KubaBlock;
import kubatech.loaders.block.KubaItemBlock;
import kubatech.loaders.block.blocks.TeaAcceptor;
import kubatech.loaders.block.blocks.TeaStorage;
import kubatech.loaders.block.defc.DEFCCasingBlock;
import kubatech.loaders.block.kubablock.KubaBlock;
import kubatech.loaders.block.kubablock.KubaItemBlock;
import kubatech.loaders.block.kubablock.blocks.TeaAcceptor;
import kubatech.loaders.block.kubablock.blocks.TeaStorage;
import kubatech.tileentity.TeaAcceptorTile;
import kubatech.tileentity.TeaStorageTile;

public class BlockLoader {

public static final KubaBlock kubaBlock = new KubaBlock(Material.anvil);
public static final ItemBlock kubaItemBlock = new KubaItemBlock(kubaBlock);
public static final DEFCCasingBlock defcCasingBlock = new DEFCCasingBlock();

public static void registerBlocks() {
GameRegistry.registerTileEntity(TeaAcceptorTile.class, "KT_TeaAcceptor");
Expand Down
Loading
Loading