mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-29 08:27:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

he do be munching tho

Browse source 
-added sounds to the runData again
This commit is contained in:
Zelophed 2020-07-19 17:08:20 +02:00
parent 19ca9dd7d6
commit 2a3da7e4d0
16 changed files with 75 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/generated/resources/.cache/cache
View file

@ -124,6 +124,8 @@ de8a40b7daf1497d5aecee47a43b3e0b1d030b00 assets/create/blockstates/fancy_scoria_
fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json
b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json
6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json
d96007df2f19d5af2924dce680ae9bc960a2e6da assets/create/blockstates/fluid_pipe.json
9d0e78a4d6d0ccac37c06d0f5810a800a04844b2 assets/create/blockstates/fluid_tank.json
3df164be441c87d6f869b34b5ab48b6822892ad6 assets/create/blockstates/fluid_pipe.json
f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json
e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json
@ -287,7 +289,7 @@ b7829c2ef2c47188713f8cab21b2c9bc7f9c5b79 assets/create/blockstates/portable_stor
e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggle_latch.json
3a739f9d4276828d83f2d2750bf3227c87bcd438 assets/create/blockstates/pulley_magnet.json
469e430d96cb0a5e1aaf6b7cc5d401d488c9e600 assets/create/blockstates/pulse_repeater.json
8d7e653bfd9846e684a0d3725595714a19201017 assets/create/blockstates/radial_chassis.json
4439fc83a8c7370ab44b211a3fd48abde20a4728 assets/create/blockstates/radial_chassis.json
8929677f2cc5354aa19ef182af69f9f0b41eb242 assets/create/blockstates/redstone_contact.json
c29213b77ac0c78d8979c5f6188d2b265696f9b9 assets/create/blockstates/redstone_link.json
1eac804cba08aebb5f4646758ae1ef9b32e01365 assets/create/blockstates/reinforced_rail.json
@ -339,16 +341,16 @@ c77b46d8b459e5c7cc495393546f3fcca8a1fa1d assets/create/blockstates/weathered_lim
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
31c4433a60168ccd2cfcb0e6f7e495684d0d160e assets/create/lang/en_ud.json
f6b3c31a6c3313e089e657c02832a201518d0dbe assets/create/lang/en_us.json
0cf3147b81b1d2103e79b3018c543faba63769a1 assets/create/lang/unfinished/de_de.json
d72b420a82e296afab9807d0183d9e8b6f8544ea assets/create/lang/unfinished/fr_fr.json
30472e049ef4d0fb92c67a2d16aa86f0face99cc assets/create/lang/unfinished/it_it.json
20db786d3ec10bc5e2f097ae31dab75c54a6ab24 assets/create/lang/unfinished/ja_jp.json
ef5dd51b525fbb21b9d9fe6ab9962f619d74aafb assets/create/lang/unfinished/ko_kr.json
f45247c1a75e90a91e798c3869dd633c7476a296 assets/create/lang/unfinished/nl_nl.json
6bf5fd3af396fdb0471c9f5f91d50c98c14eb04d assets/create/lang/unfinished/pt_br.json
1ce817630aefef48c73180965ea8ceb9c91be503 assets/create/lang/unfinished/ru_ru.json
1a8e7e8937270e74726d0d436aacf4fb7cae6b12 assets/create/lang/unfinished/zh_cn.json
13980ec87d4eb2052700af7876a8075654113cad assets/create/lang/en_us.json
0088a8fe37e3240ff4a07adccca19c0f38bb98f2 assets/create/lang/unfinished/de_de.json
65857103f58dc4ea192d89d1c05b660c9e84c648 assets/create/lang/unfinished/fr_fr.json
e3df99124bf6a3d5a49aea948bc062e98f1a8a01 assets/create/lang/unfinished/it_it.json
7af4ca0a0f30e54d24e7817b0e666fcde9ac29be assets/create/lang/unfinished/ja_jp.json
0326f97faabdc5cc42f509c31c0e216ca25b9839 assets/create/lang/unfinished/ko_kr.json
3f63334d35c7f51b4b5ef8c82b1445679791923e assets/create/lang/unfinished/nl_nl.json
a3dcdb8c77ecaf1b8867bec6e9449bddf7cdf4da assets/create/lang/unfinished/pt_br.json
88e47a6c87e370829e12a2757fba2f59e5ddae6e assets/create/lang/unfinished/ru_ru.json
9293429991cbc341843c0c3faacdf4f645f7a68e assets/create/lang/unfinished/zh_cn.json
846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json
1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json
1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json
@ -1343,6 +1345,7 @@ def7382f3216c59d835ab64f534678f3d31ecc51 assets/create/models/item/weathered_lim
9dfaa12884667458f8f727ae7666e7e4e50181d9 assets/create/models/item/zinc_ingot.json
9f9455ccb5fc9e3cbfce73862b46078346a522a5 assets/create/models/item/zinc_nugget.json
b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json
e76041b7ae829fdd7dc0524f6ca4d2f89fca51bb assets/create/sounds.json
187921fa131b06721bfaf63f2623a28c141aae9a data/create/advancements/andesite_alloy.json
0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data/create/advancements/andesite_casing.json
de37aa79135d560adf1cc5404f86761f97335314 data/create/advancements/basin.json

1
src/generated/resources/assets/create/lang/en_us.json
View file

@ -849,6 +849,7 @@
"create.subtitle.blockzapper_confirm": "Affirmative Ding",
"create.subtitle.blockzapper_deny": "Declining Boop",
"create.subtitle.block_funnel_eat": "Funnel CHOMPS",
"create.subtitle.blaze_munch": "Blaze munches happily",
"_": "->------------------------] Item Descriptions [------------------------<-",

3
src/generated/resources/assets/create/lang/unfinished/de_de.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 791",
"_": "Missing Localizations: 792",
"_": "->------------------------] Game Elements [------------------------<-",
@ -850,6 +850,7 @@
"create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative Ding",
"create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining Boop",
"create.subtitle.block_funnel_eat": "UNLOCALIZED: Funnel CHOMPS",
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily",
"_": "->------------------------] Item Descriptions [------------------------<-",

3
src/generated/resources/assets/create/lang/unfinished/fr_fr.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 394",
"_": "Missing Localizations: 395",
"_": "->------------------------] Game Elements [------------------------<-",
@ -850,6 +850,7 @@
"create.subtitle.blockzapper_confirm": "Ding d'affirmation",
"create.subtitle.blockzapper_deny": "Boop de déclin",
"create.subtitle.block_funnel_eat": "Croc d'entonoir",
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily",
"_": "->------------------------] Item Descriptions [------------------------<-",

3
src/generated/resources/assets/create/lang/unfinished/it_it.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 378",
"_": "Missing Localizations: 379",
"_": "->------------------------] Game Elements [------------------------<-",
@ -850,6 +850,7 @@
"create.subtitle.blockzapper_confirm": "Ding Affermativo",
"create.subtitle.blockzapper_deny": "Boop in Calo",
"create.subtitle.block_funnel_eat": "CHOMPS a Imbuto",
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily",
"_": "->------------------------] Item Descriptions [------------------------<-",

3
src/generated/resources/assets/create/lang/unfinished/ja_jp.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 373",
"_": "Missing Localizations: 374",
"_": "->------------------------] Game Elements [------------------------<-",
@ -850,6 +850,7 @@
"create.subtitle.blockzapper_confirm": "アファーマティブディン",
"create.subtitle.blockzapper_deny": "衰退するブープ",
"create.subtitle.block_funnel_eat": "ファンネルCHOMPS",
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily",
"_": "->------------------------] Item Descriptions [------------------------<-",

3
src/generated/resources/assets/create/lang/unfinished/ko_kr.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 378",
"_": "Missing Localizations: 379",
"_": "->------------------------] Game Elements [------------------------<-",
@ -850,6 +850,7 @@
"create.subtitle.blockzapper_confirm": "확인 효과음",
"create.subtitle.blockzapper_deny": "취소 효과음",
"create.subtitle.block_funnel_eat": "깔때기가 흡입함",
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily",
"_": "->------------------------] Item Descriptions [------------------------<-",

3
src/generated/resources/assets/create/lang/unfinished/nl_nl.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 728",
"_": "Missing Localizations: 729",
"_": "->------------------------] Game Elements [------------------------<-",
@ -850,6 +850,7 @@
"create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative Ding",
"create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining Boop",
"create.subtitle.block_funnel_eat": "UNLOCALIZED: Funnel CHOMPS",
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily",
"_": "->------------------------] Item Descriptions [------------------------<-",

3
src/generated/resources/assets/create/lang/unfinished/pt_br.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 798",
"_": "Missing Localizations: 799",
"_": "->------------------------] Game Elements [------------------------<-",
@ -850,6 +850,7 @@
"create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative Ding",
"create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining Boop",
"create.subtitle.block_funnel_eat": "UNLOCALIZED: Funnel CHOMPS",
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily",
"_": "->------------------------] Item Descriptions [------------------------<-",

3
src/generated/resources/assets/create/lang/unfinished/ru_ru.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 792",
"_": "Missing Localizations: 793",
"_": "->------------------------] Game Elements [------------------------<-",
@ -850,6 +850,7 @@
"create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative Ding",
"create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining Boop",
"create.subtitle.block_funnel_eat": "UNLOCALIZED: Funnel CHOMPS",
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily",
"_": "->------------------------] Item Descriptions [------------------------<-",

3
src/generated/resources/assets/create/lang/unfinished/zh_cn.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 54",
"_": "Missing Localizations: 55",
"_": "->------------------------] Game Elements [------------------------<-",
@ -850,6 +850,7 @@
"create.subtitle.blockzapper_confirm": "选择方块",
"create.subtitle.blockzapper_deny": "放置失败",
"create.subtitle.block_funnel_eat": "漏斗吞食",
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily",
"_": "->------------------------] Item Descriptions [------------------------<-",

21
src/main/resources/assets/create/sounds.json → src/generated/resources/assets/create/sounds.json
View file

@ -1,16 +1,16 @@
{
"creeperclock": {
"sounds": [
"create:creeperclock"
],
"subtitle": "create.subtitle.creeperclock"
},
"pigclock": {
"sounds": [
"create:pigclock"
],
"subtitle": "create.subtitle.pigclock"
},
"creeperclock": {
"sounds": [
"create:creeperclock"
],
"subtitle": "create.subtitle.creeperclock"
},
"schematicannon_launch_block": {
"sounds": [
{
@ -91,5 +91,14 @@
}
],
"subtitle": "create.subtitle.block_funnel_eat"
},
"blaze_munch": {
"sounds": [
{
"name": "minecraft:entity.generic.eat",
"type": "event"
}
],
"subtitle": "create.subtitle.blaze_munch"
}
}

14
src/main/java/com/simibubi/create/AllSoundEvents.java
View file

@ -9,6 +9,7 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.simibubi.create.foundation.utility.Lang;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.DirectoryCache;
import net.minecraft.data.IDataProvider;
import net.minecraft.util.ResourceLocation;
@ -19,8 +20,8 @@ import net.minecraftforge.registries.IForgeRegistry;
public enum AllSoundEvents implements IDataProvider {
CUCKOO_PIG("creeperclock"),
CUCKOO_CREEPER("pigclock"),
CUCKOO_PIG("pigclock"),
CUCKOO_CREEPER("creeperclock"),
SCHEMATICANNON_LAUNCH_BLOCK(SoundEvents.ENTITY_GENERIC_EXPLODE),
SCHEMATICANNON_FINISH(SoundEvents.BLOCK_NOTE_BLOCK_BELL),
@ -31,11 +32,13 @@ public enum AllSoundEvents implements IDataProvider {
BLOCKZAPPER_CONFIRM(SoundEvents.BLOCK_NOTE_BLOCK_BELL),
BLOCKZAPPER_DENY(SoundEvents.BLOCK_NOTE_BLOCK_BASS),
BLOCK_FUNNEL_EAT(SoundEvents.ENTITY_GENERIC_EAT),
BLAZE_MUNCH(SoundEvents.ENTITY_GENERIC_EAT)
;
String id;
SoundEvent event, child;
private DataGenerator generator;
// For adding our own sounds at assets/create/sounds/name.ogg
AllSoundEvents() {
@ -62,6 +65,11 @@ public enum AllSoundEvents implements IDataProvider {
return id;
}
public AllSoundEvents generator(DataGenerator generator){
this.generator = generator;
return this;
}
public static void register(RegistryEvent.Register<SoundEvent> event) {
IForgeRegistry<SoundEvent> registry = event.getRegistry();
@ -107,7 +115,7 @@ public enum AllSoundEvents implements IDataProvider {
@Override
public void act(DirectoryCache cache) throws IOException {
generate(generator.getOutputFolder(), cache);
}
@Override

1
src/main/java/com/simibubi/create/Create.java
View file

@ -109,6 +109,7 @@ public class Create {
DataGenerator gen = event.getGenerator();
gen.addProvider(new AllAdvancements(gen));
gen.addProvider(new LangMerger(gen));
gen.addProvider(AllSoundEvents.BLAZE_MUNCH.generator(gen));
}
}

13
src/main/java/com/simibubi/create/content/contraptions/processing/HeaterTileEntity.java
View file

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Random;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.content.contraptions.components.deployer.DeployerFakePlayer;
import com.simibubi.create.content.contraptions.particle.CubeParticleData;
import com.simibubi.create.foundation.tileEntity.SmartTileEntity;
@ -16,10 +17,12 @@ import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.particles.IParticleData;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.event.entity.ProjectileImpactEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@ -213,10 +216,18 @@ public class HeaterTileEntity extends SmartTileEntity {
event.getThrowable().remove();
HeaterTileEntity heater = (HeaterTileEntity) tile;
if (heater.activeFuel != FuelType.SPECIAL)
if (heater.activeFuel != FuelType.SPECIAL) {
heater.activeFuel = FuelType.NORMAL;
heater.remainingBurnTime = MathHelper.clamp(heater.remainingBurnTime + 80, 0, maxHeatCapacity);
heater.markDirty();
}
World world = event.getThrowable().world;
if (world.isRemote)
return;
world.playSound(null, heater.getPos(), AllSoundEvents.BLAZE_MUNCH.get(), SoundCategory.BLOCKS, .5F, 1F);
}

3
src/main/resources/assets/create/lang/default/messages.json
View file

@ -368,6 +368,7 @@
"create.subtitle.blockzapper_place": "Blocks zap into place",
"create.subtitle.blockzapper_confirm": "Affirmative Ding",
"create.subtitle.blockzapper_deny": "Declining Boop",
"create.subtitle.block_funnel_eat": "Funnel CHOMPS"
"create.subtitle.block_funnel_eat": "Funnel CHOMPS",
"create.subtitle.blaze_munch": "Blaze munches happily"
}