aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorBass <tudurap.com@gmail.com>2019-01-24 13:21:54 +0000
committerBass <tudurap.com@gmail.com>2019-01-24 13:21:54 +0000
commit01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343 (patch)
treeca6d3cd201ed95820caa9c828ea03c0f25ecd76a /src/main/java/com
parent1b40750ba5059473a99a064faa7342fc60a2de89 (diff)
parentb24709d41d33f1f76f2e6852323d2b5cd90bb4b0 (diff)
downloadGT5-Unofficial-01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343.tar.gz
GT5-Unofficial-01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343.tar.bz2
GT5-Unofficial-01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343.zip
Merge branch 'master' into bassAdditions
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/github/technus/tectech/CommonValues.java6
-rw-r--r--src/main/java/com/github/technus/tectech/Reference.java (renamed from src/main/java/com/github/technus/tectech/auxiliary/Reference.java)5
-rw-r--r--src/main/java/com/github/technus/tectech/TecTech.java180
-rw-r--r--src/main/java/com/github/technus/tectech/Util.java598
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java726
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java283
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java113
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java23
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java47
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java34
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java68
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java45
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java40
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java8
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java159
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileRenderEM.java73
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java74
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java68
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java78
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java (renamed from src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompat.java)6
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java78
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java (renamed from src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java)56
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java (renamed from src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java)9
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/iElementalAspect.java (renamed from src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/iElementalAspect.java)2
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java (renamed from src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompat.java)6
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java (renamed from src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java)15
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java14
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java14
-rw-r--r--src/main/java/com/github/technus/tectech/dataFramework/QuantumDataPacket.java78
-rw-r--r--src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java7
-rw-r--r--src/main/java/com/github/technus/tectech/loader/MainLoader.java299
-rw-r--r--src/main/java/com/github/technus/tectech/loader/RecipeLoader.java41
-rw-r--r--src/main/java/com/github/technus/tectech/loader/TecTechConfig.java (renamed from src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java)18
-rw-r--r--src/main/java/com/github/technus/tectech/loader/entity/EntityLoader.java (renamed from src/main/java/com/github/technus/tectech/loader/EntityLoader.java)4
-rw-r--r--src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java51
-rw-r--r--src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java (renamed from src/main/java/com/github/technus/tectech/loader/ModGuiHandler.java)2
-rw-r--r--src/main/java/com/github/technus/tectech/loader/mechanics/ElementalLoader.java (renamed from src/main/java/com/github/technus/tectech/loader/ElementalLoader.java)18
-rw-r--r--src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java (renamed from src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java)307
-rw-r--r--src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java117
-rw-r--r--src/main/java/com/github/technus/tectech/loader/thing/ComponentLoader.java26
-rw-r--r--src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java (renamed from src/main/java/com/github/technus/tectech/loader/MachineLoader.java)37
-rw-r--r--src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java (renamed from src/main/java/com/github/technus/tectech/loader/ThingsLoader.java)34
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/ConvertFloat.java76
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/ConvertInteger.java76
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/dataTransport/DataPacket.java106
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/dataTransport/InventoryDataPacket.java59
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/dataTransport/QuantumDataPacket.java48
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/README (renamed from src/main/java/com/github/technus/tectech/elementalMatter/README)0
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecay.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDecay.java)14
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDefinitionStackMap.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDefinitionStackMap.java)8
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java)27
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java)14
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalStackMap.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java)7
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/commands/GiveEM.java)26
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/ListEM.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/commands/ListEM.java)7
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalInstanceContainer.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/iElementalInstanceContainer.java)2
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipe.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/rElementalRecipe.java)2
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipeMap.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/rElementalRecipeMap.java)2
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalDefinitionStack.java)8
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java)211
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iHasElementalDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/iHasElementalDefinition.java)4
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/tElementalException.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/tElementalException.java)2
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalDefinition.java)10
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalPrimitive.java)43
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java)24
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidDequantizationInfo.java)4
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidQuantizationInfo.java)4
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemDequantizationInfo.java)4
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemQuantizationInfo.java)4
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictDequantizationInfo.java)4
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictQuantizationInfo.java)4
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/bTransformationInfo.java)24
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/iExchangeInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/iExchangeInfo.java)2
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/dAtomDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/dAtomDefinition.java)236
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/iaeaNuclide.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java)4
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/hadron/dHadronDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/hadron/dHadronDefinition.java)61
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/cPrimitiveDefinition.java)6
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eBosonDefinition.java)10
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eLeptonDefinition.java)8
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eNeutrinoDefinition.java)12
-rw-r--r--src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eQuarkDefinition.java)6
-rw-r--r--src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java8
-rw-r--r--src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java8
-rw-r--r--src/main/java/com/github/technus/tectech/network/Dispatcher.java18
-rw-r--r--src/main/java/com/github/technus/tectech/proxy/ClientProxy.java37
-rw-r--r--src/main/java/com/github/technus/tectech/proxy/CommonProxy.java39
-rw-r--r--src/main/java/com/github/technus/tectech/recipe/TT_recipe.java10
-rw-r--r--src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java87
-rw-r--r--src/main/java/com/github/technus/tectech/thing/CustomItemList.java25
-rw-r--r--src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/block/QuantumStuffBlock.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/block/ReactorSimBlock.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java59