TicTicBoooom-Mods/MasterfulMachinery
1
0
Fork 0
mirror of https://github.com/TicTicBoooom-Mods/MasterfulMachinery.git synced 2026-01-18 16:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes n stuff

Browse Source
This commit is contained in:
ticticboooom
2021-07-13 11:42:59 +01:00
parent 3f7593dd17
commit f88d94b441
11 changed files with 22 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@@ -116,7 +116,7 @@ minecraft {
property 'forge.logging.console.level', 'debug'
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
args '--mod', 'masterfulmachinery', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
mods {
examplemod {
@@ -127,9 +127,6 @@ minecraft {
}
}
// Include resources generated by data generators.
sourceSets.main.resources { srcDir 'src/generated/resources' }
shadowJar {
configurations = [project.configurations.shade]
}
@@ -190,7 +187,8 @@ dependencies {
runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}")
implementation fg.deobf('me.desht.pneumaticcraft:pneumaticcraft-repressurized:1.16.5-2.12.2-186')
implementation fg.deobf("curse.maven:create-328085:3278516")
implementation fg.deobf("curse.maven:create-328085:3384222")
implementation fg.deobf("curse.maven:flywheel-486392:3384004")
implementation fg.deobf("curse.maven:astral-sorcery-241721:3156477")
implementation fg.deobf("curse.maven:observerlib-316833:3162044")

40
demo_config/masterful_machinery/controllers/basic.json
View File

@@ -1,40 +0,0 @@
{
"controllerId": "basic",
"name": "Basic",
"ports": [
{
"type": "masterfulmachinery:items",
"name": "Basic Item",
"id": "basic",
"data": {
"rows": 3,
"columns": 3
}
},
{
"type": "masterfulmachinery:energy",
"name": "Basic Item",
"id": "chungus",
"data": {
"capacity": 1000000000
}
},
{
"type": "masterfulmachinery:fluids",
"name": "Small Item",
"id": "small",
"data": {
"capacity": 10000
}
},
{
"type": "masterfulmachinery:mekanism_gas",
"name": "Gassy",
"id": "gassy",
"data": {
"capacity": 100000
}
}
]
}

13
src/main/java/com/ticticboooom/mods/mm/MM.java
View File

@@ -14,10 +14,10 @@ import com.ticticboooom.mods.mm.client.ter.StructureGenTileEntityRenderer;
import com.ticticboooom.mods.mm.datagen.MMPackFinder;
import com.ticticboooom.mods.mm.datagen.DataGeneratorFactory;
import com.ticticboooom.mods.mm.datagen.PackType;
import com.ticticboooom.mods.mm.datagen.gen.MMBlockStateProvider;
import com.ticticboooom.mods.mm.datagen.gen.MMItemModelProvider;
import com.ticticboooom.mods.mm.datagen.gen.MMLangProvider;
import com.ticticboooom.mods.mm.datagen.gen.MMLootTableProvider;
import com.ticticboooom.mods.mm.datagen.gen.runtime.MMBlockStateProvider;
import com.ticticboooom.mods.mm.datagen.gen.runtime.MMItemModelProvider;
import com.ticticboooom.mods.mm.datagen.gen.runtime.MMLangProvider;
import com.ticticboooom.mods.mm.datagen.gen.runtime.MMLootTableProvider;
import com.ticticboooom.mods.mm.network.PacketHandler;
import com.ticticboooom.mods.mm.registration.MMLoader;
import com.ticticboooom.mods.mm.registration.MMPorts;
@@ -71,8 +71,13 @@ public class MM {
MMSetup.CONTAINER_REG.register(bus);
RecipeTypes.RECIPE_SERIALIZERS.register(bus);
bus.addListener(this::clientEvents);
try {
if (FMLEnvironment.dist == Dist.CLIENT) {
Minecraft.getInstance().getResourcePackList().addPackFinder(new MMPackFinder(PackType.RESOURCE));
}
} catch(Exception ignored){
}
MinecraftForge.EVENT_BUS.addListener(this::onServerStart);
}

3
src/main/java/com/ticticboooom/mods/mm/client/jei/category/MachineStructureRecipeCategory.java
View File

@@ -194,7 +194,7 @@ public class MachineStructureRecipeCategory implements IRecipeCategory<MachineSt
if (tag != null){
Integer index = tagIndexes.get(i);
Block block = tag.getAllElements().get(index);
Block block = tag.getAllElements().get((int) Math.floor(index / 30.0));
tagIndexCounter.put(i, tagIndexCounter.get(i) + 1);
if (tagIndexCounter.get(i) > 30){
tagIndexCounter.put(i, 0);
@@ -203,6 +203,7 @@ public class MachineStructureRecipeCategory implements IRecipeCategory<MachineSt
if (index >= tag.getAllElements().size()) {
index = 0;
}
tagIndexes.put(i, index);
if (block != null) {
BlockState defaultState = block.getDefaultState();

2
src/main/java/com/ticticboooom/mods/mm/datagen/gen/BaseLootTableProvider.java → src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/BaseLootTableProvider.java
View File

@@ -22,7 +22,7 @@
* SOFTWARE.
*/
package com.ticticboooom.mods.mm.datagen.gen;
package com.ticticboooom.mods.mm.datagen.gen.runtime;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

2
src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMBlockStateProvider.java → src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMBlockStateProvider.java
View File

@@ -1,4 +1,4 @@
package com.ticticboooom.mods.mm.datagen.gen;
package com.ticticboooom.mods.mm.datagen.gen.runtime;
import com.ticticboooom.mods.mm.MM;
import com.ticticboooom.mods.mm.block.ControllerBlock;

2
src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMItemModelProvider.java → src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMItemModelProvider.java
View File

@@ -1,4 +1,4 @@
package com.ticticboooom.mods.mm.datagen.gen;
package com.ticticboooom.mods.mm.datagen.gen.runtime;
import com.ticticboooom.mods.mm.MM;
import com.ticticboooom.mods.mm.block.ControllerBlock;

2
src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMLangProvider.java → src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMLangProvider.java
View File

@@ -1,4 +1,4 @@
package com.ticticboooom.mods.mm.datagen.gen;
package com.ticticboooom.mods.mm.datagen.gen.runtime;
import com.ticticboooom.mods.mm.MM;
import com.ticticboooom.mods.mm.block.ControllerBlock;

2
src/main/java/com/ticticboooom/mods/mm/datagen/gen/MMLootTableProvider.java → src/main/java/com/ticticboooom/mods/mm/datagen/gen/runtime/MMLootTableProvider.java
View File

@@ -1,4 +1,4 @@
package com.ticticboooom.mods.mm.datagen.gen;
package com.ticticboooom.mods.mm.datagen.gen.runtime;
import com.ticticboooom.mods.mm.block.ControllerBlock;
import com.ticticboooom.mods.mm.block.MachinePortBlock;

2
src/main/java/com/ticticboooom/mods/mm/helper/StructureHelper.java
View File

@@ -59,7 +59,7 @@ public class StructureHelper {
Map<Character, ResourceLocation> legend = new HashMap<>();
Map<ResourceLocation, Character> legendLookup = new HashMap<>();
char index = 33;
char index = 41;
for (int yi = minPos.getY(); yi <= maxPos.getY(); yi++) {
ArrayList<String> strings = new ArrayList<>();

4
version.properties
View File

@@ -1,2 +1,2 @@
#Sun Jul 04 20:32:09 BST 2021
VERSION_CODE=476
#Tue Jul 13 03:35:05 BST 2021
VERSION_CODE=553