From 304d3fb9ac451bb3492c9e44dc76e5501550b39d Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Fri, 9 May 2025 23:01:47 +0200 Subject: [PATCH] stufffffffffffffff --- .idea/gradle.xml | 1 + .idea/misc.xml | 2 +- .idea/workspace.xml | 1170 +- build.gradle | 2 + gradle.properties | 6 +- run-data/logs/debug-1.log.gz | Bin 57926 -> 68832 bytes run-data/logs/debug-2.log.gz | Bin 57944 -> 82545 bytes run-data/logs/debug-3.log.gz | Bin 78962 -> 81495 bytes run-data/logs/debug-4.log.gz | Bin 79077 -> 81552 bytes run-data/logs/debug-5.log.gz | Bin 71787 -> 81964 bytes run-data/logs/debug.log | 19537 +-- run-data/logs/latest.log | 159 +- run/config/create-client.toml | 3 - .../jei/ingredient-list-mod-sort-order.ini | 1 + run/config/jei/recipe-category-sort-order.ini | 3 + run/logs/debug-1.log.gz | Bin 145214 -> 121301 bytes run/logs/debug-2.log.gz | Bin 132380 -> 118343 bytes run/logs/debug-3.log.gz | Bin 343337 -> 116885 bytes run/logs/debug-4.log.gz | Bin 225038 -> 117002 bytes run/logs/debug-5.log.gz | Bin 236507 -> 116804 bytes run/logs/debug.log | 98023 ++-------------- run/logs/latest.log | 1843 +- run/options.txt | 58 +- run/usercache.json | 2 +- src/generated/aaaa/build.gradle | 210 - src/generated/aaaa/gradle.properties | 53 - .../gradle/wrapper/gradle-wrapper.properties | 1 - src/generated/aaaa/settings.gradle | 15 - .../main/java/com/drmangotea/aaaa/Aaaa.java | 125 - .../main/java/com/drmangotea/aaaa/Config.java | 64 - .../src/main/resources/META-INF/mods.toml | 63 - .../aaaa/src/main/resources/aaaa.mixins.json | 14 - .../aaaa/src/main/resources/pack.mcmeta | 6 - .../5b8c0f5df972d0059948e36f3c0712dca4487541 | 46 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 3 +- .../a4f054e33f64259067ca26a447a1fd4d4705e7dd | 51 +- .../e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 | 42 +- .../assets/tfmg/blockstates/cement.json | 7 + .../assets/tfmg/blockstates/cinder_block.json | 7 + .../tfmg/blockstates/cinderflour_block.json | 7 + .../tfmg/blockstates/debug_conductor.json | 7 - .../blockstates/debug_electric_block.json | 7 - .../blockstates/debug_generator_block.json | 7 - .../resources/assets/tfmg/lang/en_ud.json | 110 +- .../resources/assets/tfmg/lang/en_us.json | 110 +- .../{debug_conductor.json => cement.json} | 2 +- .../models/block/debug_electric_block.json | 6 - .../models/block/debug_generator_block.json | 6 - .../assets/tfmg/models/item/cement.json | 3 + .../assets/tfmg/models/item/cinder_block.json | 3 + .../tfmg/models/item/cinderflour_block.json | 3 + .../tfmg/models/item/debug_conductor.json | 3 - .../models/item/debug_electric_block.json | 3 - .../models/item/debug_generator_block.json | 3 - .../models/item/sulfuric_acid_bucket.json | 6 + ...n => unfinished_electromagnetic_coil.json} | 2 +- .../mechanical_crafting/flamethrower.json | 38 + .../mechanical_crafting/large_engine.json | 38 + .../quad_potato_cannon.json | 26 + .../simple_large_engine.json | 24 + .../recipes/mechanical_crafting/stator.json | 1 + .../tags/blocks/mineable/pickaxe.json | 3 +- .../tags/blocks/mineable/shovel.json | 3 +- ...ire_from_ingots_aluminum_stonecutting.json | 33 + ...e_from_ingots_constantan_stonecutting.json | 33 + ..._wire_from_ingots_copper_stonecutting.json | 33 + .../kinetics/blast_furnace_reinforcement.json | 35 + .../kinetics/cooling_fluid_bottle.json | 35 + .../crafting/kinetics/copper_grenade.json | 35 + .../kinetics/copycat_cable_block.json | 35 + .../crafting/kinetics/electrical_switch.json | 35 + .../kinetics/electricians_wrench.json | 35 + .../fireproof_brick_reinforcement.json | 35 + .../misc/crafting/kinetics/fuse_block.json | 35 + .../misc/crafting/kinetics/lithium_blade.json | 35 + .../crafting/kinetics/lithium_charge.json | 35 + .../misc/crafting/kinetics/neon_tube.json | 35 + .../misc/crafting/kinetics/oil_can.json | 35 + .../misc/crafting/kinetics/pipe_bomb.json | 35 + .../rusted_blast_furnace_reinforcement.json | 35 + .../crafting/kinetics/segmented_display.json | 35 + .../crafting/kinetics/thermite_grenade.json | 35 + .../crafting/kinetics/turbine_engine.json | 35 + .../misc/crafting/kinetics/zinc_grenade.json | 35 + ...tring_from_ingots_rubber_stonecutting.json | 33 + .../{debug_conductor.json => cement.json} | 4 +- ..._electric_block.json => cinder_block.json} | 4 +- ...ator_block.json => cinderflour_block.json} | 4 +- ...ire_from_ingots_aluminum_stonecutting.json | 8 + .../recipes/compacting/aluminum_ingot.json | 14 + .../data/tfmg/recipes/compacting/bitumen.json | 16 + .../tfmg/recipes/compacting/cast_iron.json | 18 + .../recipes/compacting/cast_iron_ingot.json | 14 + .../recipes/compacting/cinderflourblock.json | 22 + .../tfmg/recipes/compacting/lead_ingot.json | 14 + .../tfmg/recipes/compacting/nickel_ingot.json | 14 + .../recipes/compacting/plastic_sheet.json | 15 + .../recipes/compacting/synthetic_leather.json | 14 + ...e_from_ingots_constantan_stonecutting.json | 8 + ..._wire_from_ingots_copper_stonecutting.json | 8 + .../kinetics/blast_furnace_reinforcement.json | 22 + .../kinetics/cooling_fluid_bottle.json | 21 + .../crafting/kinetics/copper_grenade.json | 21 + .../kinetics/copycat_cable_block.json | 22 + .../crafting/kinetics/electric_post.json | 4 +- .../crafting/kinetics/electrical_switch.json | 27 + .../kinetics/electricians_wrench.json | 27 + .../fireproof_brick_reinforcement.json | 19 + .../recipes/crafting/kinetics/fuse_block.json | 27 + .../crafting/kinetics/lithium_blade.json | 33 + .../crafting/kinetics/lithium_charge.json | 24 + .../recipes/crafting/kinetics/neon_tube.json | 26 + .../recipes/crafting/kinetics/oil_can.json | 21 + .../recipes/crafting/kinetics/pipe_bomb.json | 16 + .../crafting/kinetics/regular_engine.json | 1 + .../rusted_blast_furnace_reinforcement.json | 37 + .../crafting/kinetics/segmented_display.json | 31 + .../crafting/kinetics/thermite_grenade.json | 21 + .../crafting/kinetics/turbine_engine.json | 25 + .../crafting/kinetics/zinc_grenade.json | 21 + .../data/tfmg/recipes/crushing/bauxite.json | 19 + .../data/tfmg/recipes/crushing/coal_coke.json | 13 + .../tfmg/recipes/crushing/copper_sulfate.json | 27 + .../data/tfmg/recipes/crushing/dirt.json | 14 + .../data/tfmg/recipes/crushing/lignite.json | 18 + .../data/tfmg/recipes/crushing/limestone.json | 13 + .../data/tfmg/recipes/crushing/sulfur.json | 18 + .../data/tfmg/recipes/filling/air_tank.json | 15 + .../tfmg/recipes/filling/butane_tank.json | 15 + .../recipes/filling/carbon_dioxide_tank.json | 15 + .../tfmg/recipes/filling/ethylene_tank.json | 15 + .../recipes/filling/furnace_gas_tank.json | 15 + .../tfmg/recipes/filling/hot_air_tank.json | 15 + .../tfmg/recipes/filling/hydrogen_tank.json | 15 + .../data/tfmg/recipes/filling/lpg_tank.json | 15 + .../data/tfmg/recipes/filling/neon_tank.json | 15 + .../tfmg/recipes/filling/propane_tank.json | 15 + .../tfmg/recipes/filling/propylene_tank.json | 15 + .../tfmg/recipes/mixing/asphalt_mixture.json | 20 + .../mixing/asphalt_mixture_from_slag.json | 20 + .../data/tfmg/recipes/mixing/cement.json | 17 + .../tfmg/recipes/mixing/concrete_mixture.json | 20 + .../mixing/concrete_mixture_from_slag.json | 20 + .../tfmg/recipes/mixing/cooling_fluid.json | 21 + .../tfmg/recipes/mixing/copper_sulfate.json | 18 + .../data/tfmg/recipes/mixing/gunpowder.json | 29 + .../tfmg/recipes/mixing/liquid_asphalt.json | 19 + .../tfmg/recipes/mixing/liquid_concrete.json | 19 + .../tfmg/recipes/mixing/magnetic_alloy.json | 24 + .../data/tfmg/recipes/mixing/napalm.json | 19 + .../data/tfmg/recipes/mixing/thermite.json | 22 + .../recipes/pressing/synthetic_leather.json | 14 + .../sequenced_assembly/heavy_plate.json | 56 + ...tring_from_ingots_rubber_stonecutting.json | 8 + .../plastic_from_ethylene.json | 24 + .../plastic_from_propylene.json | 24 + .../vat_machine_recipe/sulfuric_acid.json | 37 + .../tfmg/recipes/winding/copper_coil.json | 17 - .../recipes/winding/electromagnetic_coil.json | 20 + .../data/tfmg/recipes/winding/resistor.json | 20 + .../java/com/drmangotea/tfmg/TFMGClient.java | 5 + .../tfmg/base/TFMGBuilderTransformers.java | 8 +- .../tfmg/base/TFMGCommonEvents.java | 21 - .../tfmg/base/TFMGCreativeTabs.java | 24 +- .../drmangotea/tfmg/base/TFMGRegistrate.java | 8 +- .../com/drmangotea/tfmg/base/TFMGShapes.java | 12 +- .../{ => blocks}/TFMGDirectionalBlock.java | 3 +- .../TFMGHorizontalDirectionalBlock.java | 2 +- .../{ => blocks}/TFMGVanillaBlockStates.java | 3 +- .../base/{ => blocks}/WallMountBlock.java | 2 +- .../tfmg/base/events/TFMGClientEvents.java | 16 + .../tfmg/base/events/TFMGCommonEvents.java | 9 + .../tfmg/base/fluid/AcidFluidType.java | 6 +- .../tfmg/base/fluid/GasFluidType.java | 78 +- .../content/decoration/LithiumTorchBlock.java | 3 +- .../decoration/LithiumTorchGenerator.java | 2 +- .../cogs/EncasedAluminumCogVisual.java | 115 - .../cogs/EncasedSteelCogRenderer.java | 72 - ...derer.java => TFMGEncasedCogRenderer.java} | 33 +- ...gVisual.java => TFMGEncasedCogVisual.java} | 31 +- .../decoration/concrete/RebarPillarBlock.java | 6 +- .../concrete/RebarStairsGenerator.java | 3 - .../electricity/base/ElectricBlockEntity.java | 5 +- .../content/electricity/base/IElectric.java | 72 +- .../base/KineticElectricBlockEntity.java | 10 +- .../cables/CableConnectorBlock.java | 2 +- .../cables/CableConnectorBlockEntity.java | 10 +- .../cables/CableConnectorGenerator.java | 2 +- .../copycat_cable/CopycatCableBlock.java | 3 +- .../CopycatCableBlockEntity.java | 7 - .../electricity/debug/DebugElectricBlock.java | 38 - .../debug/DebugGeneratorBlock.java | 36 - .../debug/DebugGeneratorBlockEntity.java | 44 - .../electricity/lights/LampGenerator.java | 2 +- .../electricity/lights/LightBulbBlock.java | 7 +- .../lights/LightBulbBlockEntity.java | 3 +- .../electricity/lights/LightBulbRenderer.java | 2 +- .../lights/neon_tube/NeonTubeRenderer.java | 3 - .../electricity/measurement/AmmeterBlock.java | 0 .../measurement/AmmeterBlockEntity.java | 0 .../measurement/MultimeterItem.java | 6 + .../MultimeterOverlayRenderer.java | 199 + .../measurement/VoltMeterBlock.java | 2 +- .../electricity/storage/AccumulatorBlock.java | 19 +- .../storage/AccumulatorBlockEntity.java | 25 - .../utilities/converter/ConverterBlock.java | 2 +- .../converter/ConverterBlockEntity.java | 30 +- .../utilities/diode/ElectricDiodeBlock.java | 2 +- .../diode/ElectricDiodeBlockEntity.java | 4 +- .../utilities/diode/EncasedDiodeBlock.java | 14 +- .../ElectricPumpBlockEntity.java | 5 +- .../electric_switch/ElectricSwitchBlock.java | 2 +- .../utilities/fuse_block/FuseBlock.java | 11 +- .../utilities/fuse_block/FuseBlockEntity.java | 11 - .../utilities/polarizer/PolarizerBlock.java | 2 +- .../polarizer/PolarizerBlockEntity.java | 17 +- .../EncasedPotentiometerBlock.java | 3 +- .../potentiometer/PotentiometerBlock.java | 2 +- .../PotentiometerBlockEntity.java | 5 +- .../utilities/resistor/ResistorBlock.java | 3 +- .../resistor/ResistorBlockEntity.java | 2 +- .../SegmentedDisplayBlock.java | 5 +- .../traffic_light/TrafficLightBlock.java | 5 +- .../transformer/TransformerBlock.java | 2 +- .../transformer/TransformerBlockEntity.java | 20 +- .../VoltageObserverBlock.java | 3 +- .../VoltageObserverBlockEntity.java | 3 +- .../VoltageObserverGenerator.java | 2 +- .../base/AbstractEngineBlockEntity.java | 2 +- .../content/engines/base/EngineBlock.java | 6 +- .../EngineControllerBlock.java | 30 +- .../EngineControllerBlockEntity.java | 10 - .../EngineControllerStopControllerPacket.java | 1 - .../packets/EngineStartPacket.java | 2 +- .../large_engine/LargeEngineBlockEntity.java | 2 +- .../radial_engine/RadialEngineBlock.java | 16 +- .../regular_engine/RegularEngineVisual.java | 75 + .../BlastFurnaceOutputBlock.java | 2 +- .../BlastFurnaceReinforcementBlockItem.java | 3 +- .../BlastFurnaceReinforcementWallBlock.java | 3 +- .../casting_basin/CastingBasinBlock.java | 3 +- .../metallurgy/coke_oven/CokeOvenBlock.java | 5 +- .../concrete_hose/ConcreteHoseInstance.java | 0 .../concrete_hose/ConcreteHoseRenderer.java | 12 +- .../machinery/misc/exhaust/ExhaustBlock.java | 11 +- .../WindingMachineBlockEntity.java | 34 +- .../WindingMachineInstance.java | 0 .../WindingMachineRenderer.java | 2 +- .../DistillationControllerBlock.java | 2 +- .../machinery/vat/base/VatBlockEntity.java | 5 +- .../IndustrialMixerBlockEntity.java | 4 +- .../IndustrialMixerVisual.java | 57 + .../drmangotea/tfmg/datagen/TFMGDatagen.java | 21 +- .../recipes/TFMGProcessingRecipeGen.java | 6 +- .../datagen/recipes/TFMGRecipeProvider.java | 49 +- .../recipes/values/TFMGFillingRecipeGen.java | 27 - .../recipes/values/TFMGStandardRecipeGen.java | 51 +- .../recipes/values/WindingRecipeGen.java | 32 - .../create/TFMGCompactingRecipeGen.java | 46 + .../values/create/TFMGFillingRecipeGen.java | 78 + .../TFMGItemApplicationRecipeGen.java | 2 +- .../TFMGMechanicalCraftingRecipeGen.java | 15 +- .../values/create/TFMGMixingRecipeGen.java | 118 + .../{ => create}/TFMGPressingRecipeGen.java | 2 +- .../TFMGSequencedAssemblyRecipeGen.java | 8 +- .../values/{ => tfmg}/CastingRecipeGen.java | 6 +- .../values/{ => tfmg}/CokingRecipeGen.java | 2 +- .../{ => tfmg}/DistillationRecipeGen.java | 7 +- .../values/{ => tfmg}/HotBlastRecipeGen.java | 8 +- .../IndustrialBlastingRecipeGen.java} | 6 +- .../{ => tfmg}/PolarizingRecipeGen.java | 3 +- .../values/{ => tfmg}/VatRecipeGen.java | 23 +- .../recipes/values/tfmg/WindingRecipeGen.java | 39 + .../mixin/GoggleOverlayRendererMixin.java | 186 +- .../tfmg/mixin/RecipeProviderMixin.java | 7 +- .../tfmg/ponder/TFMGPonderIndex.java | 0 .../tfmg/ponder/TFMGPonderPlugin.java | 52 + .../tfmg/ponder/TFMGPonderScenes.java | 38 + .../drmangotea/tfmg/ponder/TFMGPonderTag.java | 0 .../tfmg/ponder/TFMGSceneBuilder.java | 49 + .../tfmg/ponder/scenes/MiscTFMGScenes.java | 667 +- .../tfmg/registry/TFMGBlockEntities.java | 74 +- .../drmangotea/tfmg/registry/TFMGBlocks.java | 51 +- .../drmangotea/tfmg/registry/TFMGFluids.java | 98 +- .../drmangotea/tfmg/registry/TFMGItems.java | 11 +- .../tfmg/registry/TFMGPartialModels.java | 8 +- src/main/resources/META-INF/mods.toml | 2 +- .../assets/minecraft/atlases/blocks.json | 5 +- .../assets/tfmg/lang/default/interface.json | 25 +- .../tfmg/models/block/aluminum_cogwheel.json | 2 +- .../models/block/concrete_hose/block.json | 397 +- .../tfmg/models/block/concrete_hose/item.json | 428 +- .../models/block/engine_gearbox/item.json | 26 +- .../models/block/large_aluminum_cogwheel.json | 2 +- .../models/block/radial_engine/cylinder.json | 8 +- .../tfmg/models/item/transmission_model.json | 8 +- .../assets/tfmg/ponder/chemical_vat.nbt | Bin 1178 -> 1606 bytes .../assets/tfmg/ponder/electricity.nbt | Bin 0 -> 759 bytes .../assets/tfmg/ponder/electricity_two.nbt | Bin 0 -> 884 bytes .../resources/assets/tfmg/ponder/engines.nbt | Bin 896 -> 1400 bytes .../block/air_intake/air_intake_small.png | Bin 595 -> 604 bytes .../tfmg/textures/block/air_intake/inputs.png | Bin 332 -> 499 bytes .../block/air_intake/inside_large.png | Bin 583 -> 781 bytes .../block/air_intake/inside_medium.png | Bin 439 -> 631 bytes .../block/air_intake/inside_small.png | Bin 507 -> 535 bytes .../tfmg/textures/block/blast_stove_side.png | Bin 358 -> 546 bytes .../block/blast_stove_side_connected.png | Bin 1077 -> 967 bytes .../tfmg/textures/block/blast_stove_top.png | Bin 257 -> 479 bytes .../block/blast_stove_top_connected.png | Bin 716 -> 733 bytes .../assets/tfmg/textures/block/centrifuge.png | Bin 0 -> 487 bytes .../tfmg/textures/block/centrifuge_top.png | Bin 0 -> 584 bytes .../tfmg/textures/block/cinderblock.png | Bin 210 -> 261 bytes .../tfmg/textures/block/cinderblock_top.png | Bin 199 -> 322 bytes .../tfmg/textures/block/cinderflourblock.png | Bin 215 -> 240 bytes .../textures/block/cinderflourblock_top.png | Bin 212 -> 320 bytes .../textures/fluid/cooling_fluid_flow.png | Bin 18397 -> 22630 bytes .../textures/fluid/cooling_fluid_still.png | Bin 11237 -> 17059 bytes .../tfmg/textures/fluid/diesel_flow.png | Bin 13167 -> 17450 bytes .../tfmg/textures/fluid/diesel_still.png | Bin 8175 -> 14914 bytes .../textures/fluid/fluid_texture_flow.png | Bin 0 -> 12247 bytes .../fluid/fluid_texture_flow.png.mcmeta | 5 + .../textures/fluid/fluid_texture_still.png | Bin 0 -> 3747 bytes .../fluid/fluid_texture_still.png.mcmeta | 5 + .../tfmg/textures/fluid/gas_texture.png | Bin 0 -> 7178 bytes .../textures/fluid/gas_texture.png.mcmeta | 5 + .../tfmg/textures/fluid/gasoline_flow.png | Bin 12983 -> 17604 bytes .../tfmg/textures/fluid/gasoline_still.png | Bin 5509 -> 13784 bytes .../tfmg/textures/fluid/kerosene_flow.png | Bin 14367 -> 19618 bytes .../tfmg/textures/fluid/kerosene_still.png | Bin 4921 -> 9199 bytes .../textures/fluid/liquid_silicon_flow.png | Bin 8175 -> 18956 bytes .../textures/fluid/liquid_silicon_still.png | Bin 8175 -> 16133 bytes .../textures/fluid/lubrication_oil_flow.png | Bin 18667 -> 22977 bytes .../textures/fluid/lubrication_oil_still.png | Bin 11393 -> 17741 bytes .../tfmg/textures/fluid/naphtha_flow.png | Bin 13361 -> 16374 bytes .../tfmg/textures/fluid/naphtha_still.png | Bin 8082 -> 11087 bytes .../textures/fluid/sulfuric_acid_flow.png | Bin 16644 -> 23807 bytes .../textures/fluid/sulfuric_acid_still.png | Bin 6047 -> 9462 bytes .../{zinc_sulfate.png => asphalt_mixture.png} | Bin .../assets/tfmg/textures/item/cement.png | Bin 0 -> 202 bytes .../assets/tfmg/textures/item/cinderblock.png | Bin 246 -> 563 bytes .../tfmg/textures/item/debug_cinderblock.png | Bin 246 -> 563 bytes .../item/empty_electromagnetic_coil.png | Bin 245 -> 0 bytes .../assets/tfmg/textures/item/empty_spool.png | Bin 260 -> 491 bytes .../textures/item/sulfuric_acid_bucket.png | Bin 287 -> 519 bytes .../item/unfinished_electromagnetic_coil.png | Bin 0 -> 498 bytes src/main/resources/logo.png | Bin 0 -> 209995 bytes 346 files changed, 27391 insertions(+), 100816 deletions(-) delete mode 100644 src/generated/aaaa/build.gradle delete mode 100644 src/generated/aaaa/gradle.properties delete mode 100644 src/generated/aaaa/gradle/wrapper/gradle-wrapper.properties delete mode 100644 src/generated/aaaa/settings.gradle delete mode 100644 src/generated/aaaa/src/main/java/com/drmangotea/aaaa/Aaaa.java delete mode 100644 src/generated/aaaa/src/main/java/com/drmangotea/aaaa/Config.java delete mode 100644 src/generated/aaaa/src/main/resources/META-INF/mods.toml delete mode 100644 src/generated/aaaa/src/main/resources/aaaa.mixins.json delete mode 100644 src/generated/aaaa/src/main/resources/pack.mcmeta create mode 100644 src/generated/resources/assets/tfmg/blockstates/cement.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/cinder_block.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/cinderflour_block.json delete mode 100644 src/generated/resources/assets/tfmg/blockstates/debug_conductor.json delete mode 100644 src/generated/resources/assets/tfmg/blockstates/debug_electric_block.json delete mode 100644 src/generated/resources/assets/tfmg/blockstates/debug_generator_block.json rename src/generated/resources/assets/tfmg/models/block/{debug_conductor.json => cement.json} (61%) delete mode 100644 src/generated/resources/assets/tfmg/models/block/debug_electric_block.json delete mode 100644 src/generated/resources/assets/tfmg/models/block/debug_generator_block.json create mode 100644 src/generated/resources/assets/tfmg/models/item/cement.json create mode 100644 src/generated/resources/assets/tfmg/models/item/cinder_block.json create mode 100644 src/generated/resources/assets/tfmg/models/item/cinderflour_block.json delete mode 100644 src/generated/resources/assets/tfmg/models/item/debug_conductor.json delete mode 100644 src/generated/resources/assets/tfmg/models/item/debug_electric_block.json delete mode 100644 src/generated/resources/assets/tfmg/models/item/debug_generator_block.json rename src/generated/resources/assets/tfmg/models/item/{zinc_sulfate.json => unfinished_electromagnetic_coil.json} (52%) create mode 100644 src/generated/resources/data/create/recipes/mechanical_crafting/flamethrower.json create mode 100644 src/generated/resources/data/create/recipes/mechanical_crafting/large_engine.json create mode 100644 src/generated/resources/data/create/recipes/mechanical_crafting/quad_potato_cannon.json create mode 100644 src/generated/resources/data/create/recipes/mechanical_crafting/simple_large_engine.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/building_blocks/aluminum_wire_from_ingots_aluminum_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/building_blocks/constantan_wire_from_ingots_constantan_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/building_blocks/copper_wire_from_ingots_copper_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/blast_furnace_reinforcement.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/cooling_fluid_bottle.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/copper_grenade.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/copycat_cable_block.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/electrical_switch.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/electricians_wrench.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/fireproof_brick_reinforcement.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/fuse_block.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/lithium_blade.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/lithium_charge.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/neon_tube.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/oil_can.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/pipe_bomb.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/rusted_blast_furnace_reinforcement.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/segmented_display.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/thermite_grenade.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/turbine_engine.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/zinc_grenade.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/synthetic_string_from_ingots_rubber_stonecutting.json rename src/generated/resources/data/tfmg/loot_tables/blocks/{debug_conductor.json => cement.json} (76%) rename src/generated/resources/data/tfmg/loot_tables/blocks/{debug_electric_block.json => cinder_block.json} (74%) rename src/generated/resources/data/tfmg/loot_tables/blocks/{debug_generator_block.json => cinderflour_block.json} (74%) create mode 100644 src/generated/resources/data/tfmg/recipes/aluminum_wire_from_ingots_aluminum_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/compacting/aluminum_ingot.json create mode 100644 src/generated/resources/data/tfmg/recipes/compacting/bitumen.json create mode 100644 src/generated/resources/data/tfmg/recipes/compacting/cast_iron.json create mode 100644 src/generated/resources/data/tfmg/recipes/compacting/cast_iron_ingot.json create mode 100644 src/generated/resources/data/tfmg/recipes/compacting/cinderflourblock.json create mode 100644 src/generated/resources/data/tfmg/recipes/compacting/lead_ingot.json create mode 100644 src/generated/resources/data/tfmg/recipes/compacting/nickel_ingot.json create mode 100644 src/generated/resources/data/tfmg/recipes/compacting/plastic_sheet.json create mode 100644 src/generated/resources/data/tfmg/recipes/compacting/synthetic_leather.json create mode 100644 src/generated/resources/data/tfmg/recipes/constantan_wire_from_ingots_constantan_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/copper_wire_from_ingots_copper_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/blast_furnace_reinforcement.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/cooling_fluid_bottle.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/copper_grenade.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/copycat_cable_block.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/electrical_switch.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/electricians_wrench.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/fireproof_brick_reinforcement.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/fuse_block.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/lithium_blade.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/lithium_charge.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/neon_tube.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/oil_can.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/pipe_bomb.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/rusted_blast_furnace_reinforcement.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/segmented_display.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/thermite_grenade.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/turbine_engine.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/zinc_grenade.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/bauxite.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/coal_coke.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/copper_sulfate.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/dirt.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/lignite.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/limestone.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/sulfur.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/air_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/butane_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/carbon_dioxide_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/ethylene_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/furnace_gas_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/hot_air_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/hydrogen_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/lpg_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/neon_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/propane_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/propylene_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/asphalt_mixture.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/asphalt_mixture_from_slag.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/cement.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/concrete_mixture.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/concrete_mixture_from_slag.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/cooling_fluid.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/copper_sulfate.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/gunpowder.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/liquid_asphalt.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/liquid_concrete.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/magnetic_alloy.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/napalm.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/thermite.json create mode 100644 src/generated/resources/data/tfmg/recipes/pressing/synthetic_leather.json create mode 100644 src/generated/resources/data/tfmg/recipes/sequenced_assembly/heavy_plate.json create mode 100644 src/generated/resources/data/tfmg/recipes/synthetic_string_from_ingots_rubber_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/vat_machine_recipe/plastic_from_ethylene.json create mode 100644 src/generated/resources/data/tfmg/recipes/vat_machine_recipe/plastic_from_propylene.json create mode 100644 src/generated/resources/data/tfmg/recipes/vat_machine_recipe/sulfuric_acid.json delete mode 100644 src/generated/resources/data/tfmg/recipes/winding/copper_coil.json create mode 100644 src/generated/resources/data/tfmg/recipes/winding/electromagnetic_coil.json create mode 100644 src/generated/resources/data/tfmg/recipes/winding/resistor.json delete mode 100644 src/main/java/com/drmangotea/tfmg/base/TFMGCommonEvents.java rename src/main/java/com/drmangotea/tfmg/base/{ => blocks}/TFMGDirectionalBlock.java (89%) rename src/main/java/com/drmangotea/tfmg/base/{ => blocks}/TFMGHorizontalDirectionalBlock.java (95%) rename src/main/java/com/drmangotea/tfmg/base/{ => blocks}/TFMGVanillaBlockStates.java (96%) rename src/main/java/com/drmangotea/tfmg/base/{ => blocks}/WallMountBlock.java (97%) delete mode 100644 src/main/java/com/drmangotea/tfmg/content/decoration/cogs/EncasedAluminumCogVisual.java delete mode 100644 src/main/java/com/drmangotea/tfmg/content/decoration/cogs/EncasedSteelCogRenderer.java rename src/main/java/com/drmangotea/tfmg/content/decoration/cogs/{EncasedAluminumCogRenderer.java => TFMGEncasedCogRenderer.java} (66%) rename src/main/java/com/drmangotea/tfmg/content/decoration/cogs/{EncasedSteelCogVisual.java => TFMGEncasedCogVisual.java} (68%) delete mode 100644 src/main/java/com/drmangotea/tfmg/content/electricity/debug/DebugElectricBlock.java delete mode 100644 src/main/java/com/drmangotea/tfmg/content/electricity/debug/DebugGeneratorBlock.java delete mode 100644 src/main/java/com/drmangotea/tfmg/content/electricity/debug/DebugGeneratorBlockEntity.java delete mode 100644 src/main/java/com/drmangotea/tfmg/content/electricity/measurement/AmmeterBlock.java delete mode 100644 src/main/java/com/drmangotea/tfmg/content/electricity/measurement/AmmeterBlockEntity.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/electricity/measurement/MultimeterOverlayRenderer.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineVisual.java delete mode 100644 src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseInstance.java delete mode 100644 src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineInstance.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerVisual.java delete mode 100644 src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGFillingRecipeGen.java delete mode 100644 src/main/java/com/drmangotea/tfmg/datagen/recipes/values/WindingRecipeGen.java create mode 100644 src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java create mode 100644 src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGFillingRecipeGen.java rename src/main/java/com/drmangotea/tfmg/datagen/recipes/values/{ => create}/TFMGItemApplicationRecipeGen.java (96%) rename src/main/java/com/drmangotea/tfmg/datagen/recipes/values/{ => create}/TFMGMechanicalCraftingRecipeGen.java (93%) create mode 100644 src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMixingRecipeGen.java rename src/main/java/com/drmangotea/tfmg/datagen/recipes/values/{ => create}/TFMGPressingRecipeGen.java (95%) rename src/main/java/com/drmangotea/tfmg/datagen/recipes/values/{ => create}/TFMGSequencedAssemblyRecipeGen.java (97%) rename src/main/java/com/drmangotea/tfmg/datagen/recipes/values/{ => tfmg}/CastingRecipeGen.java (78%) rename src/main/java/com/drmangotea/tfmg/datagen/recipes/values/{ => tfmg}/CokingRecipeGen.java (95%) rename src/main/java/com/drmangotea/tfmg/datagen/recipes/values/{ => tfmg}/DistillationRecipeGen.java (84%) rename src/main/java/com/drmangotea/tfmg/datagen/recipes/values/{ => tfmg}/HotBlastRecipeGen.java (72%) rename src/main/java/com/drmangotea/tfmg/datagen/recipes/values/{TFMGIndustrialBlastingRecipeGen.java => tfmg/IndustrialBlastingRecipeGen.java} (89%) rename src/main/java/com/drmangotea/tfmg/datagen/recipes/values/{ => tfmg}/PolarizingRecipeGen.java (85%) rename src/main/java/com/drmangotea/tfmg/datagen/recipes/values/{ => tfmg}/VatRecipeGen.java (83%) create mode 100644 src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/WindingRecipeGen.java delete mode 100644 src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderIndex.java create mode 100644 src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderPlugin.java create mode 100644 src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderScenes.java delete mode 100644 src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderTag.java create mode 100644 src/main/java/com/drmangotea/tfmg/ponder/TFMGSceneBuilder.java create mode 100644 src/main/resources/assets/tfmg/ponder/electricity.nbt create mode 100644 src/main/resources/assets/tfmg/ponder/electricity_two.nbt create mode 100644 src/main/resources/assets/tfmg/textures/fluid/fluid_texture_flow.png create mode 100644 src/main/resources/assets/tfmg/textures/fluid/fluid_texture_flow.png.mcmeta create mode 100644 src/main/resources/assets/tfmg/textures/fluid/fluid_texture_still.png create mode 100644 src/main/resources/assets/tfmg/textures/fluid/fluid_texture_still.png.mcmeta create mode 100644 src/main/resources/assets/tfmg/textures/fluid/gas_texture.png create mode 100644 src/main/resources/assets/tfmg/textures/fluid/gas_texture.png.mcmeta rename src/main/resources/assets/tfmg/textures/item/{zinc_sulfate.png => asphalt_mixture.png} (100%) create mode 100644 src/main/resources/assets/tfmg/textures/item/cement.png delete mode 100644 src/main/resources/assets/tfmg/textures/item/empty_electromagnetic_coil.png create mode 100644 src/main/resources/assets/tfmg/textures/item/unfinished_electromagnetic_coil.png create mode 100644 src/main/resources/logo.png diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ce1c62c7..83c59bd2 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,6 +5,7 @@