mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-28 16:06:48 +01:00
SuperBustedBuffer
- Removed obsolete milk filling/draining code and recipes - Fixed lack of transforms on cpu rendered stuff - Move fluid remapper to RemapHelper
This commit is contained in:
simibubi
parent
6bb6727fc8
commit
b6b6b32e96
25 changed files with 47 additions and 154 deletions
|
|
@ -425,21 +425,21 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j
|
|||
6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json
|
||||
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
|
||||
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
|
||||
93fa3a5a99cdd3267534d4702b2346177be29885 assets/create/lang/en_ud.json
|
||||
71d94e21f0c64725829f1c029592f2316fa1358e assets/create/lang/en_us.json
|
||||
35439696e4d85eebce260874de685aedb5076a6a assets/create/lang/unfinished/de_de.json
|
||||
36c5b894c038f2ff1c0ecef0391253bcd944ac22 assets/create/lang/unfinished/es_es.json
|
||||
8d451362ebecd7552739a8212ca5534ee2b32421 assets/create/lang/unfinished/es_mx.json
|
||||
b39592c64dd5d1ae29c8cf556e35b8bec0c10c63 assets/create/lang/unfinished/fr_fr.json
|
||||
e7b5d73d5f53d1a7a288103e9198c40888b3a603 assets/create/lang/unfinished/it_it.json
|
||||
68cdd7c617498c0dca12b9ec397b82904783f88b assets/create/lang/unfinished/ja_jp.json
|
||||
d1dd7683a20814625cade0688ae0cd95e6d2ba50 assets/create/lang/unfinished/ko_kr.json
|
||||
b56ea82f736da4cd067093e95e26597bf1d88b6b assets/create/lang/unfinished/nl_nl.json
|
||||
9e3e5d6eb799fae27f03a3e47782134a85657f22 assets/create/lang/unfinished/pl_pl.json
|
||||
8068aeedd8c8e5f041372512e9bd57ccef29f38c assets/create/lang/unfinished/pt_br.json
|
||||
724c38f4375687907d1f416674d2122117fb34a6 assets/create/lang/unfinished/ru_ru.json
|
||||
5522e68e3d3c14c17d6b038fc2a03acb73b76513 assets/create/lang/unfinished/zh_cn.json
|
||||
4e464bc9052209b7e6a809519c2b816dbc956bbf assets/create/lang/unfinished/zh_tw.json
|
||||
fb760b12b4bc8114744d3acc6a597b2fad88d988 assets/create/lang/en_ud.json
|
||||
66e8ae18a98d86c66393c908ab51eae5060b8e04 assets/create/lang/en_us.json
|
||||
9e94c2420840c516e24dfd7968aaad61da24b5a2 assets/create/lang/unfinished/de_de.json
|
||||
f5c05d84c11e6db204c42169228329c8d361ca51 assets/create/lang/unfinished/es_es.json
|
||||
edf3dab78e95aa442c3c667d8d1d574bfc69d5d7 assets/create/lang/unfinished/es_mx.json
|
||||
23a46ae0bc7b2181f26eeed70801714a254d2587 assets/create/lang/unfinished/fr_fr.json
|
||||
5e95153e640edc367b963489df8c92c459badcd3 assets/create/lang/unfinished/it_it.json
|
||||
a951315b2591051dad6c53739fe554fe78595250 assets/create/lang/unfinished/ja_jp.json
|
||||
419a1fc9af7d7ea0ccd612847df74e0b45380864 assets/create/lang/unfinished/ko_kr.json
|
||||
dbc823d8cb38598e75871a2187b2a58d7f77f86a assets/create/lang/unfinished/nl_nl.json
|
||||
ac609477c295be1705d3efc07848ffe6779fd397 assets/create/lang/unfinished/pl_pl.json
|
||||
95e17b968103e0ef62411489e699d39ac7ff0b64 assets/create/lang/unfinished/pt_br.json
|
||||
b37f50f613b0df44032fe5d618a5ce7227be8087 assets/create/lang/unfinished/ru_ru.json
|
||||
2254cfb88d58f6932451a1548341f10749deb2df assets/create/lang/unfinished/zh_cn.json
|
||||
6192a7ede669ae6b6f8de6701b8a924d6a756c4a assets/create/lang/unfinished/zh_tw.json
|
||||
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
|
||||
b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
|
||||
3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json
|
||||
|
|
@ -3239,7 +3239,6 @@ ff39e629b242ae91e23aec86b0a1f757dd938305 data/create/recipes/dolomite_pillar.jso
|
|||
b4a8d14d9a20e812e0acb691b5b511a87e8b0576 data/create/recipes/dolomite_pillar_from_dolomite_stonecutting.json
|
||||
d81ceba2946286d374801e698a4ca2116395cbad data/create/recipes/emptying/builders_tea.json
|
||||
20b7c7c62fa2e33199e08188dd8836844a6d9cfd data/create/recipes/emptying/honey_bottle.json
|
||||
28a0f9a45671de2e6db19fa66374e245feeed142 data/create/recipes/emptying/milk_bucket.json
|
||||
0e11aa1accb71ed62e212f23a7069b7b7b4e8119 data/create/recipes/fancy_andesite_bricks_from_andesite_stonecutting.json
|
||||
8b86fc9a9416adeaab3f26192a73a481887675c3 data/create/recipes/fancy_andesite_bricks_slab.json
|
||||
c7b762b25c7a6705dba3e922e981be851ac4f36b data/create/recipes/fancy_andesite_bricks_slab_from_fancy_andesite_bricks_stonecutting.json
|
||||
|
|
@ -3311,7 +3310,6 @@ d2ab9ce73636773165564506580f2ec13bd1fc50 data/create/recipes/fancy_weathered_lim
|
|||
244f27eadefefbc966ac384ac087c57d19484321 data/create/recipes/filling/gunpowder.json
|
||||
c8ca74a6cd071308a1750a2ad1153e79422598a0 data/create/recipes/filling/honey_bottle.json
|
||||
d20703b67dd5e4c9b75718db02d575b1c7415c12 data/create/recipes/filling/honeyed_apple.json
|
||||
c83e77a9799b6ca34dd73aa76b56159f2103c48c data/create/recipes/filling/milk_bucket.json
|
||||
08ce1420d1551ecfef5988977436c087123851a6 data/create/recipes/filling/redstone.json
|
||||
fb8e4378cd2240644a4b5c0d06e27ad772ec7695 data/create/recipes/filling/sweet_roll.json
|
||||
5b8bbde7f8b270ab75fac18d6858f2fadbc0efa3 data/create/recipes/framed_glass_from_glass_colorless_stonecutting.json
|
||||
|
|
@ -3768,7 +3766,6 @@ f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/blocks/storage_blocks/c
|
|||
7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/blocks/storage_blocks/zinc.json
|
||||
6b73c57912934d09233ad2966110968a6109f2c9 data/forge/tags/fluids/chocolate.json
|
||||
391c9b2be5740aea943a8a5fe27eb327e2d973b0 data/forge/tags/fluids/honey.json
|
||||
aa729fedc4fcca0f0a18bf7b00075af06bf5357f data/forge/tags/fluids/milk.json
|
||||
d6a4e4fe1204b718010543a28a9b9ec4e0977bd7 data/forge/tags/fluids/tea.json
|
||||
d9ffc62a496946fc4848934e7c0a6e917337f8be data/forge/tags/items/beacon_payment.json
|
||||
05ca51cdc60a5e109b5a0e3b782de13d34ebcb24 data/forge/tags/items/cobblestone.json
|
||||
|
|
|
|||
|
|
@ -435,7 +435,6 @@
|
|||
"entity.create.seat": "\u0287\u0250\u01DDS",
|
||||
"entity.create.stationary_contraption": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u028E\u0279\u0250uo\u0131\u0287\u0250\u0287S",
|
||||
"entity.create.super_glue": "\u01DDn\u05DF\u2141 \u0279\u01DDdnS",
|
||||
"fluid.create.milk": "\u029E\u05DF\u0131W",
|
||||
"fluid.create.potion": "uo\u0131\u0287o\u0500",
|
||||
"fluid.create.tea": "\u0250\u01DD\u27D8 s,\u0279\u01DDp\u05DF\u0131n\u15FA",
|
||||
"item.create.andesite_alloy": "\u028Eo\u05DF\u05DF\u2C6F \u01DD\u0287\u0131s\u01DDpu\u2C6F",
|
||||
|
|
|
|||
|
|
@ -441,7 +441,6 @@
|
|||
"entity.create.stationary_contraption": "Stationary Contraption",
|
||||
"entity.create.super_glue": "Super Glue",
|
||||
|
||||
"fluid.create.milk": "Milk",
|
||||
"fluid.create.potion": "Potion",
|
||||
"fluid.create.tea": "Builder's Tea",
|
||||
|
||||
|
|
|
|||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "Stationäre Vorrichtung",
|
||||
"entity.create.super_glue": "Superkleber",
|
||||
|
||||
"fluid.create.milk": "Milch",
|
||||
"fluid.create.potion": "Trank",
|
||||
"fluid.create.tea": "Bauherrentee",
|
||||
|
||||
|
|
|
|||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "Artilugio estacionario",
|
||||
"entity.create.super_glue": "Pegamento",
|
||||
|
||||
"fluid.create.milk": "Leche",
|
||||
"fluid.create.potion": "Poción",
|
||||
"fluid.create.tea": "Té del Constructor",
|
||||
|
||||
|
|
|
|||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "Artefacto Estacionario",
|
||||
"entity.create.super_glue": "Super Pegamento",
|
||||
|
||||
"fluid.create.milk": "Leche",
|
||||
"fluid.create.potion": "Poción",
|
||||
"fluid.create.tea": "Té del Constructor",
|
||||
|
||||
|
|
|
|||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "Engin stationnaire",
|
||||
"entity.create.super_glue": "Colle extra-forte",
|
||||
|
||||
"fluid.create.milk": "Lait",
|
||||
"fluid.create.potion": "Potion",
|
||||
"fluid.create.tea": "Thé du constructeur",
|
||||
|
||||
|
|
|
|||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "Contrazione stazionaria",
|
||||
"entity.create.super_glue": "Super colla",
|
||||
|
||||
"fluid.create.milk": "Latte",
|
||||
"fluid.create.potion": "Pozione",
|
||||
"fluid.create.tea": "Tè del costruttore",
|
||||
|
||||
|
|
|
|||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "付設からくり",
|
||||
"entity.create.super_glue": "超粘着剤",
|
||||
|
||||
"fluid.create.milk": "牛乳",
|
||||
"fluid.create.potion": "ポーション",
|
||||
"fluid.create.tea": "建築家のお茶",
|
||||
|
||||
|
|
|
|||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "고정된 구조물",
|
||||
"entity.create.super_glue": "강력 접착제",
|
||||
|
||||
"fluid.create.milk": "우유",
|
||||
"fluid.create.potion": "포션",
|
||||
"fluid.create.tea": "건축가의 차",
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 1767",
|
||||
"_": "Missing Localizations: 1766",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
|
||||
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
|
||||
|
||||
"fluid.create.milk": "UNLOCALIZED: Milk",
|
||||
"fluid.create.potion": "UNLOCALIZED: Potion",
|
||||
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",
|
||||
|
||||
|
|
|
|||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "Maszyna stacjonarna",
|
||||
"entity.create.super_glue": "Super Glue",
|
||||
|
||||
"fluid.create.milk": "Mleko",
|
||||
"fluid.create.potion": "Mikstura",
|
||||
"fluid.create.tea": "Herbatka Budowniczego",
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 1808",
|
||||
"_": "Missing Localizations: 1807",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
|
||||
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
|
||||
|
||||
"fluid.create.milk": "UNLOCALIZED: Milk",
|
||||
"fluid.create.potion": "UNLOCALIZED: Potion",
|
||||
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",
|
||||
|
||||
|
|
|
|||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "Стационарная штуковина",
|
||||
"entity.create.super_glue": "Супер-клей",
|
||||
|
||||
"fluid.create.milk": "Молоко",
|
||||
"fluid.create.potion": "Зелье",
|
||||
"fluid.create.tea": "Чай Строителя",
|
||||
|
||||
|
|
|
|||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "固定装置",
|
||||
"entity.create.super_glue": "强力胶",
|
||||
|
||||
"fluid.create.milk": "牛奶",
|
||||
"fluid.create.potion": "药水",
|
||||
"fluid.create.tea": "茶",
|
||||
|
||||
|
|
|
|||
|
|
@ -442,7 +442,6 @@
|
|||
"entity.create.stationary_contraption": "固定結構",
|
||||
"entity.create.super_glue": "強力膠",
|
||||
|
||||
"fluid.create.milk": "牛奶",
|
||||
"fluid.create.potion": "藥水",
|
||||
"fluid.create.tea": "茶",
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
"type": "create:emptying",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:milk_bucket"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:bucket"
|
||||
},
|
||||
{
|
||||
"fluid": "minecraft:milk",
|
||||
"amount": 1000
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
"type": "create:filling",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:bucket"
|
||||
},
|
||||
{
|
||||
"fluidTag": "forge:milk",
|
||||
"amount": 1000
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:milk_bucket"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -117,18 +117,4 @@ public class AllFluids {
|
|||
|
||||
}
|
||||
|
||||
@EventBusSubscriber(modid = Create.ID, bus = Bus.FORGE)
|
||||
public static class MissingMappingsSubscriber {
|
||||
|
||||
@SubscribeEvent
|
||||
public static void missingMappings(RegistryEvent.MissingMappings<Fluid> event) {
|
||||
for (Mapping<Fluid> mapping : event.getMappings(Create.ID)) {
|
||||
if (mapping.key.getPath().equals("milk"))
|
||||
mapping.remap(ForgeMod.MILK.get());
|
||||
else if (mapping.key.getPath().equals("flowing_milk"))
|
||||
mapping.remap(ForgeMod.FLOWING_MILK.get());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,8 +105,7 @@ public class GenericItemFilling {
|
|||
}
|
||||
|
||||
private static boolean canFillBucketInternally(FluidStack availableFluid) {
|
||||
return availableFluid.getFluid()
|
||||
.isSame(ForgeMod.MILK.get());
|
||||
return false;
|
||||
}
|
||||
|
||||
public static ItemStack fillItem(World world, int requiredAmount, ItemStack stack, FluidStack availableFluid) {
|
||||
|
|
@ -124,12 +123,6 @@ public class GenericItemFilling {
|
|||
return fillBottle;
|
||||
}
|
||||
|
||||
if (stack.getItem() == Items.BUCKET && canFillBucketInternally(toFill)) {
|
||||
ItemStack filledBucket = new ItemStack(Items.MILK_BUCKET);
|
||||
stack.shrink(1);
|
||||
return filledBucket;
|
||||
}
|
||||
|
||||
ItemStack split = stack.copy();
|
||||
split.setCount(1);
|
||||
LazyOptional<IFluidHandlerItem> capability =
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import com.simibubi.create.foundation.render.SuperByteBuffer;
|
|||
import com.simibubi.create.foundation.utility.AngleHelper;
|
||||
import com.simibubi.create.foundation.utility.AnimationTickHolder;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
|
|
@ -26,12 +27,12 @@ public class CopperBacktankRenderer extends KineticTileEntityRenderer {
|
|||
int light, int overlay) {
|
||||
super.renderSafe(te, partialTicks, ms, buffer, light, overlay);
|
||||
|
||||
BlockState blockState = te.getBlockState();
|
||||
SuperByteBuffer cogs =
|
||||
CreateClient.BUFFER_CACHE.renderPartial(AllBlockPartials.COPPER_BACKTANK_COGS, te.getBlockState());
|
||||
CreateClient.BUFFER_CACHE.renderPartial(AllBlockPartials.COPPER_BACKTANK_COGS, blockState);
|
||||
cogs.matrixStacker()
|
||||
.centre()
|
||||
.rotateY(180 + AngleHelper.horizontalAngle(te.getBlockState()
|
||||
.getValue(CopperBacktankBlock.HORIZONTAL_FACING)))
|
||||
.rotateY(180 + AngleHelper.horizontalAngle(blockState.getValue(CopperBacktankBlock.HORIZONTAL_FACING)))
|
||||
.unCentre()
|
||||
.translate(0, 6.5f / 16, 11f / 16)
|
||||
.rotate(Direction.EAST,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import com.simibubi.create.AllRecipeTypes;
|
|||
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraftforge.common.ForgeMod;
|
||||
|
||||
public class EmptyingRecipeGen extends ProcessingRecipeGen {
|
||||
|
||||
|
|
@ -24,12 +23,7 @@ public class EmptyingRecipeGen extends ProcessingRecipeGen {
|
|||
BUILDERS_TEA = create("builders_tea", b -> b
|
||||
.require(AllItems.BUILDERS_TEA.get())
|
||||
.output(AllFluids.TEA.get(), 250)
|
||||
.output(Items.GLASS_BOTTLE)),
|
||||
|
||||
MILK_BUCKET = create("milk_bucket", b -> b
|
||||
.require(Items.MILK_BUCKET)
|
||||
.output(ForgeMod.MILK.get(), 1000)
|
||||
.output(Items.BUCKET))
|
||||
.output(Items.GLASS_BOTTLE))
|
||||
|
||||
;
|
||||
|
||||
|
|
|
|||
|
|
@ -54,11 +54,7 @@ public class FillingRecipeGen extends ProcessingRecipeGen {
|
|||
|
||||
GLOWSTONE = create("glowstone", b -> b.require(PotionFluidHandler.potionIngredient(Potions.NIGHT_VISION, 25))
|
||||
.require(AllItems.CINDER_FLOUR.get())
|
||||
.output(Items.GLOWSTONE_DUST)),
|
||||
|
||||
MILK_BUCKET = create("milk_bucket", b -> b.require(Tags.Fluids.MILK, 1000)
|
||||
.require(Items.BUCKET)
|
||||
.output(Items.MILK_BUCKET))
|
||||
.output(Items.GLOWSTONE_DUST))
|
||||
|
||||
;
|
||||
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ public class SuperByteBuffer {
|
|||
public SuperByteBuffer(BufferBuilder buf) {
|
||||
template = new BufferBuilderReader(buf);
|
||||
transforms = new MatrixStack();
|
||||
transforms.pushPose();
|
||||
stacker = MatrixTransformStack.of(transforms);
|
||||
}
|
||||
|
||||
|
|
@ -203,7 +204,10 @@ public class SuperByteBuffer {
|
|||
}
|
||||
|
||||
public SuperByteBuffer reset() {
|
||||
transforms = new MatrixStack();
|
||||
while (!transforms.clear())
|
||||
transforms.popPose();
|
||||
transforms.pushPose();
|
||||
|
||||
shouldColor = false;
|
||||
r = 0;
|
||||
g = 0;
|
||||
|
|
|
|||
|
|
@ -53,17 +53,17 @@ import static com.simibubi.create.content.palettes.AllPaletteBlocks.SPRUCE_WINDO
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.simibubi.create.AllBlocks;
|
||||
import com.simibubi.create.Create;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.fluid.Fluid;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.ForgeMod;
|
||||
import net.minecraftforge.event.RegistryEvent;
|
||||
import net.minecraftforge.event.RegistryEvent.MissingMappings.Mapping;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.ModContainer;
|
||||
import net.minecraftforge.fml.ModList;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
|
||||
|
|
@ -76,17 +76,12 @@ public class RemapHelper {
|
|||
reMap.put("encased_shaft", ANDESITE_ENCASED_SHAFT.getId());
|
||||
reMap.put("encased_belt", AllBlocks.ENCASED_CHAIN_DRIVE.getId());
|
||||
reMap.put("adjustable_pulley", AllBlocks.ADJUSTABLE_CHAIN_GEARSHIFT.getId());
|
||||
// reMap.put("linked_extractor", );
|
||||
reMap.put("limestone_stairs", Create.asResource("polished_limestone_stairs"));
|
||||
// reMap.put("window_in_a_block", );
|
||||
reMap.put("weathered_limestone_layers", Create.asResource("layered_weathered_limestone"));
|
||||
reMap.put("stockswitch", STOCKPILE_SWITCH.getId());
|
||||
reMap.put("indented_gabbro_slab", Create.asResource("polished_gabbro_slab"));
|
||||
// reMap.put("vertical_extractor", );
|
||||
reMap.put("andesite_layers", Create.asResource("layered_andesite"));
|
||||
reMap.put("scoria_layers", Create.asResource("layered_scoria"));
|
||||
// reMap.put("extractor", );
|
||||
// reMap.put("linked_transposer", );
|
||||
reMap.put("dark_scoria_tiles_stairs", Create.asResource("dark_scoria_bricks_stairs"));
|
||||
reMap.put("redstone_latch", POWERED_LATCH.getId());
|
||||
reMap.put("oak_glass", OAK_WINDOW.getId());
|
||||
|
|
@ -98,9 +93,6 @@ public class RemapHelper {
|
|||
reMap.put("limestone_wall", Create.asResource("polished_limestone_wall"));
|
||||
reMap.put("acacia_glass_pane", ACACIA_WINDOW_PANE.getId());
|
||||
reMap.put("dark_oak_glass", DARK_OAK_WINDOW.getId());
|
||||
// reMap.put("vertical_linked_extractor", );
|
||||
// reMap.put("vertical_funnel", );
|
||||
// reMap.put("vertical_linked_transposer", );
|
||||
reMap.put("dark_oak_glass_pane", DARK_OAK_WINDOW_PANE.getId());
|
||||
reMap.put("belt_funnel", BRASS_BELT_FUNNEL.getId());
|
||||
reMap.put("dark_scoria_tiles", Create.asResource("dark_scoria_bricks"));
|
||||
|
|
@ -109,7 +101,6 @@ public class RemapHelper {
|
|||
reMap.put("weathered_limestone_stairs", Create.asResource("polished_weathered_limestone_stairs"));
|
||||
reMap.put("dolomite_layers", Create.asResource("layered_dolomite"));
|
||||
reMap.put("jungle_glass", JUNGLE_WINDOW.getId());
|
||||
// reMap.put("transposer", );
|
||||
reMap.put("iron_glass", ORNATE_IRON_WINDOW.getId());
|
||||
reMap.put("limestone_slab", Create.asResource("polished_limestone_slab"));
|
||||
reMap.put("entity_detector", CONTENT_OBSERVER.getId());
|
||||
|
|
@ -117,7 +108,6 @@ public class RemapHelper {
|
|||
reMap.put("scoria_slab", Create.asResource("polished_scoria_slab"));
|
||||
reMap.put("birch_glass", BIRCH_WINDOW.getId());
|
||||
reMap.put("saw", MECHANICAL_SAW.getId());
|
||||
// reMap.put("vertical_transposer", );
|
||||
reMap.put("flexpulsepeater", ADJUSTABLE_PULSE_REPEATER.getId());
|
||||
reMap.put("dolomite_wall", Create.asResource("polished_dolomite_wall"));
|
||||
reMap.put("gabbro_layers", Create.asResource("layered_gabbro"));
|
||||
|
|
@ -125,7 +115,6 @@ public class RemapHelper {
|
|||
reMap.put("stress_gauge", STRESSOMETER.getId());
|
||||
reMap.put("gabbro_slab", Create.asResource("polished_gabbro_slab"));
|
||||
reMap.put("spruce_glass", SPRUCE_WINDOW.getId());
|
||||
// reMap.put("cocoa_log", );
|
||||
reMap.put("iron_glass_pane", ORNATE_IRON_WINDOW_PANE.getId());
|
||||
reMap.put("birch_glass_pane", BIRCH_WINDOW_PANE.getId());
|
||||
reMap.put("harvester", MECHANICAL_HARVESTER.getId());
|
||||
|
|
@ -147,55 +136,32 @@ public class RemapHelper {
|
|||
reMap.put("diorite_layers", Create.asResource("layered_diorite"));
|
||||
reMap.put("oak_glass_pane", OAK_WINDOW_PANE.getId());
|
||||
reMap.put("translation_chassis", LINEAR_CHASSIS.getId());
|
||||
// reMap.put("symmetry_tripleplane", Create.asResource(""));
|
||||
reMap.put("weathered_limestone_slab", Create.asResource("polished_weathered_limestone_slab"));
|
||||
reMap.put("gabbro_stairs", Create.asResource("polished_gabbro_stairs"));
|
||||
reMap.put("limestone_layers", Create.asResource("layered_limestone"));
|
||||
// reMap.put("symmetry_plane", Create.asResource(""));
|
||||
reMap.put("translation_chassis_secondary", SECONDARY_LINEAR_CHASSIS.getId());
|
||||
reMap.put("jungle_glass_pane", JUNGLE_WINDOW_PANE.getId());
|
||||
reMap.put("piston_pole", PISTON_EXTENSION_POLE.getId());
|
||||
|
||||
// reMap.put("shadow_steel_sword", );
|
||||
reMap.put("crushed_copper", CRUSHED_COPPER.getId());
|
||||
reMap.put("empty_blueprint", SCHEMATIC.getId());
|
||||
// reMap.put("shadow_steel_mattock", );
|
||||
// reMap.put("rose_quartz_sword", );
|
||||
reMap.put("gold_sheet", GOLDEN_SHEET.getId());
|
||||
reMap.put("flour", WHEAT_FLOUR.getId());
|
||||
// reMap.put("encased_shaft", );
|
||||
reMap.put("blueprint_and_quill", SCHEMATIC_AND_QUILL.getId());
|
||||
reMap.put("crushed_iron", CRUSHED_IRON.getId());
|
||||
// reMap.put("blazing_axe", );
|
||||
reMap.put("slot_cover", CRAFTER_SLOT_COVER.getId());
|
||||
reMap.put("blueprint", SCHEMATIC.getId());
|
||||
reMap.put("symmetry_wand", WAND_OF_SYMMETRY.getId());
|
||||
reMap.put("terrain_zapper", WORLDSHAPER.getId());
|
||||
// reMap.put("blazing_sword", );
|
||||
// reMap.put("zinc_handle", HAND_CRANK.getId());
|
||||
// reMap.put("rose_quartz_axe", );
|
||||
// reMap.put("shadow_steel_pickaxe", );
|
||||
reMap.put("crushed_zinc", CRUSHED_ZINC.getId());
|
||||
// reMap.put("rose_quartz_pickaxe", );
|
||||
// reMap.put("blazing_pickaxe", );
|
||||
reMap.put("property_filter", ATTRIBUTE_FILTER.getId());
|
||||
// reMap.put("blazing_shovel", );
|
||||
reMap.put("crushed_gold", CRUSHED_GOLD.getId());
|
||||
reMap.put("obsidian_dust", POWDERED_OBSIDIAN.getId());
|
||||
// reMap.put("rose_quartz_shovel", );
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onRemapBlocks(RegistryEvent.MissingMappings<Block> event) {
|
||||
ModContainer mod = ModList.get()
|
||||
.getModContainerById(Create.ID)
|
||||
.orElse(null);
|
||||
if (mod == null)
|
||||
return;
|
||||
event.setModContainer(mod);
|
||||
ImmutableList<RegistryEvent.MissingMappings.Mapping<Block>> mappings = event.getMappings();
|
||||
|
||||
for (RegistryEvent.MissingMappings.Mapping<Block> mapping : mappings) {
|
||||
for (RegistryEvent.MissingMappings.Mapping<Block> mapping : event.getMappings(Create.ID)) {
|
||||
if (reMap.containsKey(mapping.key.getPath())) {
|
||||
try {
|
||||
Create.LOGGER.warn("Remapping block '{}' to '{}'", mapping.key, reMap.get(mapping.key.getPath()));
|
||||
|
|
@ -210,15 +176,7 @@ public class RemapHelper {
|
|||
|
||||
@SubscribeEvent
|
||||
public static void onRemapItems(RegistryEvent.MissingMappings<Item> event) {
|
||||
ModContainer mod = ModList.get()
|
||||
.getModContainerById(Create.ID)
|
||||
.orElse(null);
|
||||
if (mod == null)
|
||||
return;
|
||||
event.setModContainer(mod);
|
||||
ImmutableList<RegistryEvent.MissingMappings.Mapping<Item>> mappings = event.getMappings();
|
||||
|
||||
for (RegistryEvent.MissingMappings.Mapping<Item> mapping : mappings) {
|
||||
for (RegistryEvent.MissingMappings.Mapping<Item> mapping : event.getMappings(Create.ID)) {
|
||||
if (reMap.containsKey(mapping.key.getPath())) {
|
||||
try {
|
||||
Create.LOGGER.warn("Remapping item '{}' to '{}'", mapping.key, reMap.get(mapping.key.getPath()));
|
||||
|
|
@ -230,4 +188,17 @@ public class RemapHelper {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onRemapFluids(RegistryEvent.MissingMappings<Fluid> event) {
|
||||
for (Mapping<Fluid> mapping : event.getMappings(Create.ID)) {
|
||||
if (mapping.key.getPath()
|
||||
.equals("milk"))
|
||||
mapping.remap(ForgeMod.MILK.get());
|
||||
else if (mapping.key.getPath()
|
||||
.equals("flowing_milk"))
|
||||
mapping.remap(ForgeMod.FLOWING_MILK.get());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue