maxscout/Create-The_Factory_Must_Grow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coke oven fixes + cast iron rebalance

Browse Source
This commit is contained in:
DrMangoTea
2023-11-14 15:57:19 +01:00
parent f9ebef8568
commit 34331772fa
48 changed files with 111 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/coke_oven/CokeOvenBlockEntity.java
View File

@@ -128,7 +128,7 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren
/////
RecipeWrapper inventoryIn = new RecipeWrapper(inputInventory);
if (lastRecipe == null || !lastRecipe.matches(inventoryIn, level)) {
if ((lastRecipe == null || !lastRecipe.matches(inventoryIn, level))&&timer==-1) {
Optional<CokingRecipe> recipe = TFMGRecipeTypes.COKING.find(inventoryIn, level);
if (!recipe.isPresent()) {
timer = -1;
@@ -194,7 +194,7 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren
)){
timer = lastRecipe.getProcessingDuration();
inputInventory.setItem(0,new ItemStack(inputInventory.getItem(0).getItem(),inputInventory.getItem(0).getCount()-10));
inputInventory.setItem(0,new ItemStack(inputInventory.getItem(0).getItem(),inputInventory.getItem(0).getCount()-5));
}
// if(lastRecipe != null)
@@ -213,7 +213,7 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren
) {
timer--;
tank1.getPrimaryHandler().setFluid(new FluidStack(lastRecipe.getFluidResults().get(0), tank1.getPrimaryHandler().getFluidAmount()+lastRecipe.getFluidResults().get(0).getAmount()));
tank2.getPrimaryHandler().setFluid(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(),tank2.getPrimaryHandler().getFluidAmount()+CARBON_DIOXIDE_PRODUCTION));
//tank2.getPrimaryHandler().setFluid(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(),tank2.getPrimaryHandler().getFluidAmount()+CARBON_DIOXIDE_PRODUCTION));
}
}
@@ -225,13 +225,13 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren
return;
if(!isController)
return;
RecipeWrapper inventoryIn = new RecipeWrapper(inputInventory);
if (lastRecipe == null || !lastRecipe.matches(inventoryIn, level)) {
Optional<CokingRecipe> recipe = TFMGRecipeTypes.COKING.find(inventoryIn, level);
if (!recipe.isPresent())
return;
lastRecipe = recipe.get();
}
//RecipeWrapper inventoryIn = new RecipeWrapper(inputInventory);
//if (lastRecipe == null || !lastRecipe.matches(inventoryIn, level)) {
// Optional<CokingRecipe> recipe = TFMGRecipeTypes.COKING.find(inventoryIn, level);
// if (!recipe.isPresent())
// return;
// lastRecipe = recipe.get();
//}
BlockPos toSpawn = getBlockPos().below().relative(this.getBlockState().getValue(FACING));
//
ItemEntity itemToSpawn = new ItemEntity(level,toSpawn.getX()+0.5f,toSpawn.getY()+0.5f,toSpawn.getZ()+0.5f, lastRecipe.getResultItem().copy());
@@ -368,10 +368,10 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren
// Lang.translate("goggles.surface_scanner.distance",controller.getBlockPos().getY())
// .style(ChatFormatting.DARK_BLUE)
// .forGoggles(tooltip,1);
//if(controller !=null)
// Lang.translate("goggles.surface_scanner.distance",controller.getBlockPos().getZ())
// .style(ChatFormatting.DARK_BLUE)
// .forGoggles(tooltip,1);
// if(controller !=null)
// Lang.translate("goggles.surface_scanner.distance",controller.timer)
// .style(ChatFormatting.DARK_BLUE)
// .forGoggles(tooltip,1);
//
//if(controller==null){
// Lang.translate("aaaaaaaaaaaaaaaaaaaaaaaaaaa")

6
src/main/java/com/drmangotea/createindustry/registry/TFMGBlockEntities.java
View File

@@ -343,21 +343,21 @@ public class TFMGBlockEntities {
public static final BlockEntityEntry<SimpleKineticBlockEntity> TFMG_ENCASED_COGWHEEL = REGISTRATE
.blockEntity("tfmg_encased_cogwheel", SimpleKineticBlockEntity::new)
.instance(() -> EncasedCogInstance::small, false)
.validBlocks(TFMGBlocks.STEEL_ENCASED_COGWHEEL, TFMGBlocks.HEAVY_CASING_ENCASED_COGWHEEL)
// .validBlocks(TFMGBlocks.STEEL_ENCASED_COGWHEEL, TFMGBlocks.HEAVY_CASING_ENCASED_COGWHEEL)
.renderer(() -> EncasedCogRenderer::small)
.register();
public static final BlockEntityEntry<SimpleKineticBlockEntity> TFMG_ENCASED_LARGE_COGWHEEL = REGISTRATE
.blockEntity("tfmg_encased_large_cogwheel", SimpleKineticBlockEntity::new)
.instance(() -> EncasedCogInstance::large, false)
.validBlocks(TFMGBlocks.STEEL_ENCASED_LARGE_COGWHEEL, TFMGBlocks.HEAVY_CASING_ENCASED_LARGE_COGWHEEL)
// .validBlocks(TFMGBlocks.STEEL_ENCASED_LARGE_COGWHEEL, TFMGBlocks.HEAVY_CASING_ENCASED_LARGE_COGWHEEL)
.renderer(() -> EncasedCogRenderer::large)
.register();
public static final BlockEntityEntry<KineticBlockEntity> TFMG_ENCASED_SHAFT = REGISTRATE
.blockEntity("tfmg_encased_shaft", KineticBlockEntity::new)
.instance(() -> ShaftInstance::new, false)
.validBlocks(TFMGBlocks.STEEL_ENCASED_SHAFT, TFMGBlocks.HEAVY_CASING_ENCASED_SHAFT)
// .validBlocks(TFMGBlocks.STEEL_ENCASED_SHAFT, TFMGBlocks.HEAVY_CASING_ENCASED_SHAFT)
.renderer(() -> ShaftRenderer::new)
.register();

120
src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java
View File

@@ -1333,66 +1333,66 @@ public static final BlockEntry<DistillationOutputBlock> STEEL_DISTILLATION_OUTPU
//------------------------ENCASED BLOCKS-----------------//
public static final BlockEntry<TFMGEncasedShaftBlock> STEEL_ENCASED_SHAFT =
REGISTRATE.block("steel_encased_shaft", p -> new TFMGEncasedShaftBlock(p, TFMGBlocks.STEEL_CASING::get))
.properties(p -> p.color(MaterialColor.PODZOL))
.transform(TFMGBuilderTransformers.encasedShaft("steel", () -> TFMGSpriteShifts.STEEL_CASING))
.transform(EncasingRegistry.addVariantTo(AllBlocks.SHAFT))
.transform(axeOrPickaxe())
.register();
public static final BlockEntry<TFMGEncasedShaftBlock> HEAVY_CASING_ENCASED_SHAFT =
REGISTRATE.block("heavy_casing_encased_shaft", p -> new TFMGEncasedShaftBlock(p, TFMGBlocks.HEAVY_MACHINERY_CASING::get))
.properties(p -> p.color(MaterialColor.COLOR_GRAY))
.transform(TFMGBuilderTransformers.encasedShaft("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING))
.transform(EncasingRegistry.addVariantTo(AllBlocks.SHAFT))
.transform(axeOrPickaxe())
.register();
/////////
public static final BlockEntry<TFMGEncasedCogwheelBlock> STEEL_ENCASED_COGWHEEL =
REGISTRATE.block("steel_encased_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, false, TFMGBlocks.STEEL_CASING::get))
.properties(p -> p.color(MaterialColor.PODZOL))
.transform(TFMGBuilderTransformers.encasedCogwheel("steel", () -> TFMGSpriteShifts.STEEL_CASING))
.transform(EncasingRegistry.addVariantTo(AllBlocks.COGWHEEL))
.onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCogCTBehaviour(TFMGSpriteShifts.STEEL_CASING,
Couple.create(TFMGSpriteShifts.STEEL_ENCASED_COGWHEEL_SIDE,
TFMGSpriteShifts.STEEL_ENCASED_COGWHEEL_OTHERSIDE))))
.transform(axeOrPickaxe())
.register();
public static final BlockEntry<TFMGEncasedCogwheelBlock> HEAVY_CASING_ENCASED_COGWHEEL =
REGISTRATE.block("heavy_casing_encased_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, false, TFMGBlocks.HEAVY_MACHINERY_CASING::get))
.properties(p -> p.color(MaterialColor.COLOR_GRAY))
.transform(TFMGBuilderTransformers.encasedCogwheel("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING))
.transform(EncasingRegistry.addVariantTo(AllBlocks.COGWHEEL))
.onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCogCTBehaviour(TFMGSpriteShifts.HEAVY_MACHINERY_CASING,
Couple.create(TFMGSpriteShifts.HEAVY_CASING_ENCASED_COGWHEEL_SIDE,
TFMGSpriteShifts.HEAVY_CASING_ENCASED_COGWHEEL_OTHERSIDE))))
.transform(axeOrPickaxe())
.register();
//////
public static final BlockEntry<TFMGEncasedCogwheelBlock> STEEL_ENCASED_LARGE_COGWHEEL = REGISTRATE
.block("steel_encased_large_cogwheel",
p -> new TFMGEncasedCogwheelBlock(p, true, TFMGBlocks.STEEL_CASING::get))
.properties(p -> p.color(MaterialColor.PODZOL))
.transform(TFMGBuilderTransformers.encasedLargeCogwheel("steel", () -> TFMGSpriteShifts.STEEL_CASING))
.transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL))
.transform(axeOrPickaxe())
.register();
public static final BlockEntry<TFMGEncasedCogwheelBlock> HEAVY_CASING_ENCASED_LARGE_COGWHEEL = REGISTRATE
.block("heavy_casing_encased_large_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, true, TFMGBlocks.HEAVY_MACHINERY_CASING::get))
.properties(p -> p.color(MaterialColor.TERRACOTTA_BROWN))
.transform(TFMGBuilderTransformers.encasedLargeCogwheel("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING))
.transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL))
.transform(axeOrPickaxe())
.register();
//public static final BlockEntry<TFMGEncasedShaftBlock> STEEL_ENCASED_SHAFT =
// REGISTRATE.block("steel_encased_shaft", p -> new TFMGEncasedShaftBlock(p, TFMGBlocks.STEEL_CASING::get))
// .properties(p -> p.color(MaterialColor.PODZOL))
// .transform(TFMGBuilderTransformers.encasedShaft("steel", () -> TFMGSpriteShifts.STEEL_CASING))
// .transform(EncasingRegistry.addVariantTo(AllBlocks.SHAFT))
// .transform(axeOrPickaxe())
// .register();
//
//public static final BlockEntry<TFMGEncasedShaftBlock> HEAVY_CASING_ENCASED_SHAFT =
// REGISTRATE.block("heavy_casing_encased_shaft", p -> new TFMGEncasedShaftBlock(p, TFMGBlocks.HEAVY_MACHINERY_CASING::get))
// .properties(p -> p.color(MaterialColor.COLOR_GRAY))
// .transform(TFMGBuilderTransformers.encasedShaft("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING))
// .transform(EncasingRegistry.addVariantTo(AllBlocks.SHAFT))
// .transform(axeOrPickaxe())
// .register();
//
///////////
//
//public static final BlockEntry<TFMGEncasedCogwheelBlock> STEEL_ENCASED_COGWHEEL =
// REGISTRATE.block("steel_encased_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, false, TFMGBlocks.STEEL_CASING::get))
// .properties(p -> p.color(MaterialColor.PODZOL))
// .transform(TFMGBuilderTransformers.encasedCogwheel("steel", () -> TFMGSpriteShifts.STEEL_CASING))
// .transform(EncasingRegistry.addVariantTo(AllBlocks.COGWHEEL))
// .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCogCTBehaviour(TFMGSpriteShifts.STEEL_CASING,
// Couple.create(TFMGSpriteShifts.STEEL_ENCASED_COGWHEEL_SIDE,
// TFMGSpriteShifts.STEEL_ENCASED_COGWHEEL_OTHERSIDE))))
// .transform(axeOrPickaxe())
// .register();
//
//public static final BlockEntry<TFMGEncasedCogwheelBlock> HEAVY_CASING_ENCASED_COGWHEEL =
// REGISTRATE.block("heavy_casing_encased_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, false, TFMGBlocks.HEAVY_MACHINERY_CASING::get))
// .properties(p -> p.color(MaterialColor.COLOR_GRAY))
// .transform(TFMGBuilderTransformers.encasedCogwheel("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING))
// .transform(EncasingRegistry.addVariantTo(AllBlocks.COGWHEEL))
// .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCogCTBehaviour(TFMGSpriteShifts.HEAVY_MACHINERY_CASING,
// Couple.create(TFMGSpriteShifts.HEAVY_CASING_ENCASED_COGWHEEL_SIDE,
// TFMGSpriteShifts.HEAVY_CASING_ENCASED_COGWHEEL_OTHERSIDE))))
// .transform(axeOrPickaxe())
// .register();
//
////////
//public static final BlockEntry<TFMGEncasedCogwheelBlock> STEEL_ENCASED_LARGE_COGWHEEL = REGISTRATE
// .block("steel_encased_large_cogwheel",
// p -> new TFMGEncasedCogwheelBlock(p, true, TFMGBlocks.STEEL_CASING::get))
// .properties(p -> p.color(MaterialColor.PODZOL))
// .transform(TFMGBuilderTransformers.encasedLargeCogwheel("steel", () -> TFMGSpriteShifts.STEEL_CASING))
// .transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL))
// .transform(axeOrPickaxe())
// .register();
//
//public static final BlockEntry<TFMGEncasedCogwheelBlock> HEAVY_CASING_ENCASED_LARGE_COGWHEEL = REGISTRATE
// .block("heavy_casing_encased_large_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, true, TFMGBlocks.HEAVY_MACHINERY_CASING::get))
// .properties(p -> p.color(MaterialColor.TERRACOTTA_BROWN))
// .transform(TFMGBuilderTransformers.encasedLargeCogwheel("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING))
// .transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL))
// .transform(axeOrPickaxe())
// .register();
//
//
//
//-----------------------CONCRETE---------------------------//
static {
REGISTRATE.creativeModeTab(() -> TFMGCreativeModeTabs.TFMG_BUILDING_BLOCKS);

BIN
src/main/resources/assets/createindustry/textures/block/pumpjack_hammer.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 789 B

After

Width:  |  Height:  |  Size: 789 B

4
src/main/resources/data/createindustry/recipes/coking/coal_coke.json
View File

@@ -2,14 +2,14 @@
"type": "createindustry:coking",
"ingredients": [
{
"count": 10,
"count": 5,
"item": "minecraft:coal"
}
],
"processingTime": 1000,
"results": [
{
"count": 10,
"count": 5,
"item": "createindustry:coal_coke"
}
,

23
src/main/resources/data/createindustry/recipes/crafting/coke_oven.json Normal file
View File

@@ -0,0 +1,23 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" I ",
" "
],
"key": {
"I": {
"item": "create:industrial_iron_block"
},
"I": {
"tag": "forge:ingots/cast_iron"
}
},
"result": {
"item": "createindustry:coke_oven",
"count": 3
}
}

17
src/main/resources/data/createindustry/recipes/item_application/coke_oven.json
View File

@@ -1,17 +0,0 @@
{
"type": "create:item_application",
"ingredients": [
{
"item": "create:industrial_iron_block"
},
{
"tag": "forge:ingots/cast_iron"
}
],
"results": [
{
"item": "createindustry:coke_oven"
}
]
}

8
src/main/resources/data/createindustry/recipes/mixing/cast_iron_ingot.json
View File

@@ -5,12 +5,6 @@
{
"item": "minecraft:iron_ingot"
},
{
"item": "minecraft:coal"
},
{
"item": "minecraft:coal"
},
{
"item": "minecraft:coal"
}
@@ -22,5 +16,5 @@
}
],
"heatRequirement": "heated",
"processingTime": 1000
"processingTime": 100
}