Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
RuiXuqi committed Jan 25, 2023
2 parents 640d2b4 + c257b5b commit 7aac618
Show file tree
Hide file tree
Showing 113 changed files with 354 additions and 3,008 deletions.
64 changes: 32 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@

![Mekanism Logo](logo.png)


![Update Display](updatedisplay.png)

# Repository description for sddsd2332 #

Here is sddsd2332 for the Minecraft modpacks [Ultimate Technology] modified Mekanism

# sddsd2332 #
If you need this mod, you can fork the repository to build, or go to the actions of the repository to download the latest build

This is an unofficial test version of MEK for sddsd2332, some machines have been modified.

Because I don’t have time to make it recently, maybe this is the last version
If there is a good proposal, it can be submitted through a PR

If anyone needs it, you can download it
I may not have time to update, maybe this is an update for the last version

# Mekanism for Minecraft 1.12 #

Mekanism is a Minecraft add-on featuring high-tech machinery that can be used to create powerful tools,
Mekanism is a Minecraft add-on featuring high-tech machinery that can be used to create powerful tools,
armor, and weapons. You can find more detail on the features at the [**Official Website**](http://aidancbrady.com/mekanism/).
Mekanism is an independent tech mod that brings low, mid, and high tier machinery to Minecraft. The
mod doesn't have an actual goal, and you'll understand this when you see all the random content
Mekanism contains, from jetpacks to balloons. However, I can assure you that you'll notice all the
Mekanism is an independent tech mod that brings low, mid, and high tier machinery to Minecraft. The
mod doesn't have an actual goal, and you'll understand this when you see all the random content
Mekanism contains, from jetpacks to balloons. However, I can assure you that you'll notice all the
content blend together as you get to know the mod better!

Mekanism uses a tier-based system when organizing several of its core features, including Energy
Cubes and Factories. There are four tiers: basic, the simplest tier, advanced, the second-most basic
tier, elite, the second-most complex tier, and ultimate, the most complex tier. You can upgrade
tiers by placing the component in a crafting grid and surrounding it with the necessary resources
Mekanism uses a tier-based system when organizing several of its core features, including Energy
Cubes and Factories. There are four tiers: basic, the simplest tier, advanced, the second-most basic
tier, elite, the second-most complex tier, and ultimate, the most complex tier. You can upgrade
tiers by placing the component in a crafting grid and surrounding it with the necessary resources
for the next upgrade.

By the time you've been using Mekanism for a while, you'll have a near-instructible suit of Obsidian
Armor, be obtaining four ingots for each ore you mine, have the ability to fly wherever you want with
By the time you've been using Mekanism for a while, you'll have a near-instructible suit of Obsidian
Armor, be obtaining four ingots for each ore you mine, have the ability to fly wherever you want with
the hydrogen-powered jetpacks, and have a cute robotic friend following you around while you mine. :)

# Discord #

Mekanism has a [discord](https://discord.gg/nmSjMGc) where you can come chat with other Mekanism users and the developers. Join us!
Official Mekanism has a[discord](https://discord.gg/nmSjMGc) where you can come chat with other Mekanism users and the developers. Join us!

# License #

Mekanism is under the MIT license. You may use it in modpacks, reviews or any other form as long as you abide by the terms below.
Mekanism is under the MIT license. You may use it in modpacks, reviews or any other form as long as you abide by the terms below.

Copyright 2017 Aidan C. Brady

Expand All @@ -50,21 +50,21 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

# Credits #

* aidancbrady
* thommy101
* thiakil
* pupnewfster
* dizzyd
* unpairedbracket
* CyanideX (artwork)
* Cheapshot (artwork)
* Archadia (artwork)
* micdoodle
* Bluexin
* JaSpr
* aidancbrady
* thommy101
* thiakil
* pupnewfster
* dizzyd
* unpairedbracket
* CyanideX (artwork)
* Cheapshot (artwork)
* Archadia (artwork)
* micdoodle
* Bluexin
* JaSpr

## YourKit ##
YourKit supports open source projects with innovative and intelligent tools for monitoring and
profiling Java and .NET applications. YourKit is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler),
YourKit supports open source projects with innovative and intelligent tools for monitoring and
profiling Java and .NET applications. YourKit is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler),
[YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/) and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).
Mekanism uses YourKit for all our profiling needs!
15 changes: 8 additions & 7 deletions src/main/java/mekanism/client/ClientProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -337,21 +337,18 @@ public void registerBlockRenders() {


ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock), 4, getInventoryMRL("digital_miner"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock), 14, getInventoryMRL("isotopic_centrifuge"));

ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock), 13, getInventoryMRL("personal_chest"));

ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), 6, getInventoryMRL("chemical_dissolution_chamber"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), 8, getInventoryMRL("chemical_crystallizer"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), 9, getInventoryMRL("seismic_vibrator"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), 11, getInventoryMRL("fluid_tank"));



ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 0, getInventoryMRL("quantum_entangloporter"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 1, getInventoryMRL("solar_neutron_activator"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 4, getInventoryMRL("resistive_heater"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 9, getInventoryMRL("personal_chest"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 14, getInventoryMRL("antiprotonic_nucleosynthesizer"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 9, getInventoryMRL("isotopic_centrifuge"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 13, getInventoryMRL("antiprotonic_nucleosynthesizer"));

ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), 9, getInventoryMRL("security_desk"));

Expand All @@ -368,7 +365,11 @@ public void registerBlockRenders() {
String resource = "mekanism:" + type.getName();
RecipeType recipePointer = null;

if (type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY|| type == MachineType.ULTIMATE_FACTORY || type == MachineType.CREATIVE_FACTORY) {
if (type == MachineType.BASIC_FACTORY
|| type == MachineType.ADVANCED_FACTORY
|| type == MachineType.ELITE_FACTORY
|| type == MachineType.ULTIMATE_FACTORY
|| type == MachineType.CREATIVE_FACTORY) {
recipePointer = RecipeType.values()[0];
resource = "mekanism:" + type.getName() + "_" + recipePointer.getName();
}
Expand Down
14 changes: 5 additions & 9 deletions src/main/java/mekanism/common/base/IFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,23 +72,19 @@ enum RecipeType implements IStringSerializable {
SMELTING("Smelting", "smelter", MachineType.ENERGIZED_SMELTER, MachineFuelType.BASIC, false, Recipe.ENERGIZED_SMELTER),
ENRICHING("Enriching", "enrichment", MachineType.ENRICHMENT_CHAMBER, MachineFuelType.BASIC, false, Recipe.ENRICHMENT_CHAMBER),
CRUSHING("Crushing", "crusher", MachineType.CRUSHER, MachineFuelType.BASIC, false, Recipe.CRUSHER),
COMPRESSING("Compressing", "compressor", MachineType.OSMIUM_COMPRESSOR, MachineFuelType.ADVANCED, false, Recipe.OSMIUM_COMPRESSOR),
COMBINING("Combining", "combiner", MachineType.COMBINER, MachineFuelType.DOUBLE, false, Recipe.COMBINER),
PURIFYING("Purifying", "purifier", MachineType.PURIFICATION_CHAMBER, MachineFuelType.ADVANCED, true, Recipe.PURIFICATION_CHAMBER),
INJECTING("Injecting", "injection", MachineType.CHEMICAL_INJECTION_CHAMBER, MachineFuelType.ADVANCED, true, Recipe.CHEMICAL_INJECTION_CHAMBER),
INFUSING("Infusing", "metalinfuser", MachineType.METALLURGIC_INFUSER, MachineFuelType.BASIC, false, Recipe.METALLURGIC_INFUSER),
SAWING("Sawing", "sawmill", MachineType.PRECISION_SAWMILL, MachineFuelType.CHANCE, false, Recipe.PRECISION_SAWMILL),
STAMPING("Stamping","stamping",MachineType.STAMPING,MachineFuelType.BASIC, false, Recipe.STAMPING),
ROLLING("Rolling","rolling",MachineType.ROLLING,MachineFuelType.BASIC, false, Recipe.ROLLING),
BRUSHED ("Brushed","brushed",MachineType.BRUSHED,MachineFuelType.BASIC, false, Recipe.BRUSHED),
TURNING("Turning","turning",MachineType.TURNING,MachineFuelType.BASIC, false, Recipe.TURNING),

COMPRESSING("Compressing", "compressor", MachineType.OSMIUM_COMPRESSOR, MachineFuelType.ADVANCED, false, Recipe.OSMIUM_COMPRESSOR),
PURIFYING("Purifying", "purifier", MachineType.PURIFICATION_CHAMBER, MachineFuelType.ADVANCED, true, Recipe.PURIFICATION_CHAMBER),
INJECTING("Injecting", "injection", MachineType.CHEMICAL_INJECTION_CHAMBER, MachineFuelType.ADVANCED, true, Recipe.CHEMICAL_INJECTION_CHAMBER),

COMBINING("Combining", "combiner", MachineType.COMBINER, MachineFuelType.DOUBLE, false, Recipe.COMBINER),
AllOY("Alloy","alloy",MachineType.ALLOY,MachineFuelType.DOUBLE,false,Recipe.ALLOY),

SAWING("Sawing", "sawmill", MachineType.PRECISION_SAWMILL, MachineFuelType.CHANCE, false, Recipe.PRECISION_SAWMILL),
EXTRACTOR("Extractor","extractor",MachineType.CELL_EXTRACTOR,MachineFuelType.CHANCE,false, Recipe.CELL_EXTRACTOR),
SEPARATOR("Separator","separator",MachineType.CELL_SEPARATOR,MachineFuelType.CHANCE,false, Recipe.CELL_SEPARATOR),

FARM("Farm","farm",MachineType.ORGANIC_FARM,MachineFuelType.FARM,false,Recipe.ORGANIC_FARM);


Expand Down
36 changes: 18 additions & 18 deletions src/main/java/mekanism/common/block/states/BlockStateMachine.java
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ public enum MachineType implements IStringSerializable, IBlockType {
BASIC_FACTORY(MachineBlock.MACHINE_BLOCK_1, 5, "Factory", 11, TileEntityFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.BASIC),
ADVANCED_FACTORY(MachineBlock.MACHINE_BLOCK_1, 6, "Factory", 11, TileEntityAdvancedFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ADVANCED),
ELITE_FACTORY(MachineBlock.MACHINE_BLOCK_1, 7, "Factory", 11, TileEntityEliteFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ELITE),
ULTIMATE_FACTORY(MachineBlock.MACHINE_BLOCK_1,8, "Factory", 11, TileEntityUltimateFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ULTIMATE),
CREATIVE_FACTORY(MachineBlock.MACHINE_BLOCK_1,9,"Factory", 11,TileEntityCreativeFactory::new,true, false, true, Plane.HORIZONTAL, true, FactoryTier.CREATIVE),
METALLURGIC_INFUSER(MachineBlock.MACHINE_BLOCK_1, 10, "MetallurgicInfuser", 12, TileEntityMetallurgicInfuser::new, true, true, true, Plane.HORIZONTAL, false),
PURIFICATION_CHAMBER(MachineBlock.MACHINE_BLOCK_1, 11, "PurificationChamber", 15, TileEntityPurificationChamber::new, true, false, true, Plane.HORIZONTAL, true),
ENERGIZED_SMELTER(MachineBlock.MACHINE_BLOCK_1, 12, "EnergizedSmelter", 16, TileEntityEnergizedSmelter::new, true, false, true, Plane.HORIZONTAL, true),
TELEPORTER(MachineBlock.MACHINE_BLOCK_1, 13, "Teleporter", 13, TileEntityTeleporter::new, true, false, false, BlockStateUtils.NO_ROTATION, false),
ISOTOPIC_CENTRIFUGE(MachineBlock.MACHINE_BLOCK_1, 14, "IsotopicCentrifuge", 61, TileEntityIsotopicCentrifuge::new, false, true, false, Plane.HORIZONTAL, false),

METALLURGIC_INFUSER(MachineBlock.MACHINE_BLOCK_1, 8, "MetallurgicInfuser", 12, TileEntityMetallurgicInfuser::new, true, true, true, Plane.HORIZONTAL, false),
PURIFICATION_CHAMBER(MachineBlock.MACHINE_BLOCK_1, 9, "PurificationChamber", 15, TileEntityPurificationChamber::new, true, false, true, Plane.HORIZONTAL, true),
ENERGIZED_SMELTER(MachineBlock.MACHINE_BLOCK_1, 10, "EnergizedSmelter", 16, TileEntityEnergizedSmelter::new, true, false, true, Plane.HORIZONTAL, true),
TELEPORTER(MachineBlock.MACHINE_BLOCK_1, 11, "Teleporter", 13, TileEntityTeleporter::new, true, false, false, BlockStateUtils.NO_ROTATION, false),
ELECTRIC_PUMP(MachineBlock.MACHINE_BLOCK_1, 12, "ElectricPump", 17, TileEntityElectricPump::new, true, true, false, Plane.HORIZONTAL, false),
PERSONAL_CHEST(MachineBlock.MACHINE_BLOCK_1, 13, "PersonalChest", 19, TileEntityPersonalChest::new, true, true, false, Plane.HORIZONTAL, false),
CHARGEPAD(MachineBlock.MACHINE_BLOCK_1,14, "Chargepad", -1, TileEntityChargepad::new, true, true, false, Plane.HORIZONTAL, false),
LOGISTICAL_SORTER(MachineBlock.MACHINE_BLOCK_1, 15, "LogisticalSorter", 59, TileEntityLogisticalSorter::new, false, true, false, BlockStateUtils.ALL_FACINGS, true),

ROTARY_CONDENSENTRATOR(MachineBlock.MACHINE_BLOCK_2, 0, "RotaryCondensentrator", 7, TileEntityRotaryCondensentrator::new, true, true, false, Plane.HORIZONTAL, false),
CHEMICAL_OXIDIZER(MachineBlock.MACHINE_BLOCK_2, 1, "ChemicalOxidizer", 29, TileEntityChemicalOxidizer::new, true, true, true, Plane.HORIZONTAL, true),
Expand All @@ -110,24 +110,25 @@ public enum MachineType implements IStringSerializable, IBlockType {
LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser::new, true, true, false, BlockStateUtils.ALL_FACINGS, false),
LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier::new, false, true, false, BlockStateUtils.ALL_FACINGS, true),
LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam::new, false, true, false, BlockStateUtils.ALL_FACINGS, true),

QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "QuantumEntangloporter", 46, TileEntityQuantumEntangloporter::new, true, false, false, BlockStateUtils.ALL_FACINGS, false),
SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator::new, false, true, false, Plane.HORIZONTAL, true),
AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator::new, true, true, false, Plane.HORIZONTAL, true),
OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator::new, false, false, false, Plane.HORIZONTAL, true),
RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater::new, true, false, false, Plane.HORIZONTAL, true),
FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator::new, true, false, true, Plane.HORIZONTAL, true),
FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater::new, false, false, false, Plane.HORIZONTAL, true),
CHARGEPAD(MachineBlock.MACHINE_BLOCK_3,7, "Chargepad", -1, TileEntityChargepad::new, true, true, false, Plane.HORIZONTAL, false),
ELECTRIC_PUMP(MachineBlock.MACHINE_BLOCK_3, 8, "ElectricPump", 17, TileEntityElectricPump::new, true, true, false, Plane.HORIZONTAL, false),
PERSONAL_CHEST(MachineBlock.MACHINE_BLOCK_3, 9, "PersonalChest", 19, TileEntityPersonalChest::new, true, true, false, Plane.HORIZONTAL, false),
LOGISTICAL_SORTER(MachineBlock.MACHINE_BLOCK_3, 10, "LogisticalSorter", 59, TileEntityLogisticalSorter::new, false, true, false, BlockStateUtils.ALL_FACINGS, true),
Nutritional_Liquifier(MachineBlock.MACHINE_BLOCK_3, 11, "NutritionalLiquifier", 60, TileEntityNutritionalLiquifier::new, true, true, true, Plane.HORIZONTAL, true),

ULTIMATE_FACTORY(MachineBlock.MACHINE_BLOCK_3,7, "Factory", 11, TileEntityUltimateFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ULTIMATE),
CREATIVE_FACTORY(MachineBlock.MACHINE_BLOCK_3,8,"Factory", 11,TileEntityCreativeFactory::new,true, false, true, Plane.HORIZONTAL, true, FactoryTier.CREATIVE),
ISOTOPIC_CENTRIFUGE(MachineBlock.MACHINE_BLOCK_3, 9, "IsotopicCentrifuge", 61, TileEntityIsotopicCentrifuge::new, false, true, false, Plane.HORIZONTAL, false),


Nutritional_Liquifier(MachineBlock.MACHINE_BLOCK_3, 10, "NutritionalLiquifier", 60, TileEntityNutritionalLiquifier::new, true, true, true, Plane.HORIZONTAL, true),
//INDUSTRIAL_ALARM(MachineBlock.MACHINE_BLOCK_3,12,"IndustrialAlarm",-1,TileEntityIndustrialAlarm::new,false,true,false, Plane.HORIZONTAL,true);
SUPERCHARGED_COIL(MachineBlock.MACHINE_BLOCK_3,12,"superchargedcoil",-1, TileEntitySuperchargedCoil::new,false,true,false,BlockStateUtils.ALL_FACINGS,false),
ORGANIC_FARM(MachineBlock.MACHINE_BLOCK_3,13,"organicfarm",63,TileEntityOrganicFarm::new,true,false,true, Plane.HORIZONTAL, true),
ANTIPROTONIC_NUCLEOSYNTHESIZER(MachineBlock.MACHINE_BLOCK_3, 14,"antiprotonicnucleosynthesizer",62, TileEntityAntiprotonicNucleosynthesizer::new, true, true, true, Plane.HORIZONTAL, true),
SUPERCHARGED_COIL(MachineBlock.MACHINE_BLOCK_3,11,"SuperchargedCoil",-1, TileEntitySuperchargedCoil::new,false,true,false,BlockStateUtils.ALL_FACINGS,false),
ORGANIC_FARM(MachineBlock.MACHINE_BLOCK_3,12,"OrganicFarm",63,TileEntityOrganicFarm::new,true,false,true, Plane.HORIZONTAL, true),
ANTIPROTONIC_NUCLEOSYNTHESIZER(MachineBlock.MACHINE_BLOCK_3, 13,"antiprotonicnucleosynthesizer",62, TileEntityAntiprotonicNucleosynthesizer::new, true, true, true, Plane.HORIZONTAL, true),


STAMPING(MachineBlock.MACHINE_BLOCK_4,0,"Stamping",64,TileEntityStamping::new,true,false,true, Plane.HORIZONTAL, true),
Expand All @@ -140,7 +141,6 @@ public enum MachineType implements IStringSerializable, IBlockType {
CELL_SEPARATOR(MachineBlock.MACHINE_BLOCK_4,7,"CellSeparator",71,TileEntityCellSeparator::new,true,false,true,Plane.HORIZONTAL, true)/*,
BASIC_FACTORY2(MachineBlock.MACHINE_BLOCK_4, 8, "Factory", 11, TileEntityFactory2::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.BASIC),
ADVANCED_FACTORY2(MachineBlock.MACHINE_BLOCK_4, 9, "Factory", 11, TileEntityAdvancedFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ADVANCED),
ELITE_FACTORY2(MachineBlock.MACHINE_BLOCK_4, 10, "Factory", 11, TileEntityEliteFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ELITE),
ULTIMATE_FACTORY2(MachineBlock.MACHINE_BLOCK_4,11, "Factory", 11, TileEntityUltimateFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ULTIMATE),
Expand Down
Loading

0 comments on commit 7aac618

Please sign in to comment.